Changeset 392 for branches/1.2

Timestamp:

05/23/2007 01:04:03 AM (19 months ago)

Author:

moo

Message:

merged 391 from trunk->1.2: fixed #96, wrong format string for sprintf

Location:

branches/1.2

Files:

• . (modified) (1 prop)
• mem.c (modified) (1 diff)
• xc_malloc.c (modified) (1 diff)
• xcache.c (modified) (1 diff)

branches/1.2/mem.c

@@ -315 +315 @@
     /* requires at least the header and 1 tail block */
     if (size < MINSIZE) {
-        fprintf(stderr, "xc_mem_init requires %d bytes at least\n", MINSIZE);
+        fprintf(stderr, "xc_mem_init requires %lu bytes at least\n", (unsigned long) MINSIZE);
         return NULL;
     }

branches/1.2/xc_malloc.c

@@ -90 +90 @@
     /* requires at least the header and 1 tail block */
     if (size < MINSIZE) {
-        fprintf(stderr, "xc_mem_malloc_init requires %d bytes at least\n", MINSIZE);
+        fprintf(stderr, "xc_mem_malloc_init requires %lu bytes at least\n", (unsigned long) MINSIZE);
         return NULL;
     }

branches/1.2/xcache.c

@@ -1561 +1561 @@
     }
     if (strlen(admin_pass) != 32) {
-        php_error_docref(NULL TSRMLS_CC, E_ERROR, "unexpect %d bytes of xcache.admin.pass, expected 32 bytes, the password after md5()", strlen(admin_pass));
+        php_error_docref(NULL TSRMLS_CC, E_ERROR, "unexpect %lu bytes of xcache.admin.pass, expected 32 bytes, the password after md5()", (unsigned long) strlen(admin_pass));
         zend_bailout();
     }