Changeset a2d3c2c in git

Timestamp:

2006-05-25T02:38:27Z (14 years ago)

Author:

Xuefer <xuefer@…>

Branches:

1.0, 1.1, 1.2, 1.3, 3.0, 3.1, 3.2, master, trunk

Children:

e59d43c

Parents:

d7d6864

Message:

get* proto changes

git-svn-id: ​svn://svn.lighttpd.net/xcache/trunk@20 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:

• const_string.c (modified) (3 diffs)
• const_string.h (modified) (1 diff)
• opcode_spec.c (modified) (2 diffs)
• opcode_spec.h (modified) (1 diff)
• xcache.c (modified) (3 diffs)

const_string.c

@@ -25 +25 @@
 };
 
-int xc_get_op_type_count()
+zend_uchar xc_get_op_type_count()
 {
     return sizeof(op_type_names) / sizeof(op_type_names[0]);
@@ -71 +71 @@
 };
 
-int xc_get_data_type_count()
+zend_uchar xc_get_data_type_count()
 {
     return sizeof(data_type_names) / sizeof(data_type_names[0]);
@@ -102 +102 @@
 #endif
 
-int xc_get_opcode_count()
+zend_uchar xc_get_opcode_count()
 {
     return sizeof(xc_opcode_names) / sizeof(xc_opcode_names[0]);

const_string.h

@@ -1 +1 @@
 #include "php.h"
 
-int xc_get_op_type_count();
+zend_uchar xc_get_op_type_count();
 const char *xc_get_op_type(zend_uchar op_type);
-int xc_get_data_type_count();
+zend_uchar xc_get_data_type_count();
 const char *xc_get_data_type(zend_uchar data_type);
-int xc_get_opcode_count();
+zend_uchar xc_get_opcode_count();
 const char *xc_get_opcode(zend_uchar opcode);

opcode_spec.c

@@ -13 +13 @@
 #include "opcode_spec_def.h"
 
-int xc_get_opcode_spec_count()
+zend_uchar xc_get_opcode_spec_count()
 {
     return sizeof(xc_opcode_spec) / sizeof(xc_opcode_spec[0]);
@@ -31 +31 @@
 static const char *xc_op_spec[] = { OPSPECS(OPSPECS_DEF_NAME) };
 
-int xc_get_op_spec_count()
+zend_uchar xc_get_op_spec_count()
 {
     return sizeof(xc_op_spec) / sizeof(xc_op_spec[0]);

opcode_spec.h

@@ -39 +39 @@
 
 const xc_opcode_spec_t *xc_get_opcode_spec(zend_uchar opcode);
-int xc_get_opcode_spec_count();
-int xc_get_op_spec_count();
+zend_uchar xc_get_opcode_spec_count();
+zend_uchar xc_get_op_spec_count();
 const char *xc_get_op_spec(zend_uchar spec);

xcache.c

@@ -830 +830 @@
     typedef struct {
         const char *prefix;
-        int (*getsize)();
+        zend_uchar (*getsize)();
         const char *(*get)(zend_uchar i);
     } xc_meminfo_t;
@@ -841 +841 @@
     };
     xc_meminfo_t* p;
-    int i;
+    zend_uchar i, count;
     char const_name[96];
     int const_name_len;
@@ -847 +847 @@
 
     for (p = nameinfos; p->getsize; p ++) {
-        for (i = p->getsize() - 1; i >= 0; i --) {
+        count = p->getsize();
+        for (i = 0; i < count; i ++) {
             const char *name = p->get(i);
             if (!name) continue;