Changeset 840
Legend:
- Unmodified
- Added
- Removed
-
trunk/processor/dispatch.m4
r662 r840 24 24 , `$1', `xc_entry_type_t', `PROC_INT(`$2', `d', `$1')' 25 25 , `$1', `xc_hash_value_t', `PROC_INT(`$2', `lu', `$1')' 26 , `$1', `xc_md5sum_t', ` /* is copying enough? */COPY(`$2')'26 , `$1', `xc_md5sum_t', `COPY(`$2')' 27 27 , `', `', `m4_errprint(`Unknown type "$1"')' 28 28 ) … … 39 39 ifelse( 40 40 `$2', `zend_bool', `add_assoc_bool_ex(arr, ZEND_STRS("$3"), src->$3[i] ? 1 : 0);' 41 , `', `', `add_ assoc_long_ex(arr, ZEND_STRS("$3"), src->$3[i]);')41 , `', `', `add_next_index_long(arr, src->$3[i]);') 42 42 } 43 43 add_assoc_zval_ex(dst, ZEND_STRS("$3"), arr); -
trunk/xcache.c
r832 r840 146 146 xc_entry_data_php_t *p; 147 147 for (p = php->cache->phps[php->hvalue]; p; p = p->next) { 148 if (memcmp( php->md5,p->md5, sizeof(php->md5)) == 0) {148 if (memcmp(&php->md5, &p->md5, sizeof(php->md5)) == 0) { 149 149 p->hits ++; 150 150 return p; … … 170 170 xc_entry_data_php_t *p; 171 171 for (p = *pp; p; pp = &(p->next), p = p->next) { 172 if (memcmp( php->md5,p->md5, sizeof(php->md5)) == 0) {172 if (memcmp(&php->md5, &p->md5, sizeof(php->md5)) == 0) { 173 173 /* unlink */ 174 174 *pp = p->next; … … 1088 1088 static inline xc_hash_value_t xc_php_hash_md5(xc_entry_data_php_t *php TSRMLS_DC) /* {{{ */ 1089 1089 { 1090 return HASH_STR_S( php->md5, sizeof(php->md5));1090 return HASH_STR_S(&php->md5, sizeof(php->md5)); 1091 1091 } 1092 1092 /* }}} */ … … 1109 1109 PHP_MD5Update(&context, buf, n); 1110 1110 } 1111 PHP_MD5Final((unsigned char *) php->md5 , &context);1111 PHP_MD5Final((unsigned char *) php->md5.digest, &context); 1112 1112 1113 1113 php_stream_close(stream); -
trunk/xcache.h
r832 r840 343 343 #endif 344 344 typedef enum { XC_TYPE_PHP, XC_TYPE_VAR } xc_entry_type_t; 345 typedef char xc_md5sum_t[16]; 345 typedef struct { 346 char digest[16]; 347 } xc_md5sum_t; 346 348 /* {{{ xc_compilererror_t */ 347 349 typedef struct {
