Changeset 392 in svn


Ignore:
Timestamp:
2007-05-23T03:04:03+02:00 (8 years ago)
Author:
Xuefer
Message:

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

Location:
branches/1.2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/1.2

    • Property svnmerge-integrated changed
      /trunkmerged: 391
  • branches/1.2/mem.c

    r380 r392  
    315315    /* requires at least the header and 1 tail block */
    316316    if (size < MINSIZE) {
    317         fprintf(stderr, "xc_mem_init requires %d bytes at least\n", MINSIZE);
     317        fprintf(stderr, "xc_mem_init requires %lu bytes at least\n", (unsigned long) MINSIZE);
    318318        return NULL;
    319319    }
  • branches/1.2/xc_malloc.c

    r380 r392  
    9090    /* requires at least the header and 1 tail block */
    9191    if (size < MINSIZE) {
    92         fprintf(stderr, "xc_mem_malloc_init requires %d bytes at least\n", MINSIZE);
     92        fprintf(stderr, "xc_mem_malloc_init requires %lu bytes at least\n", (unsigned long) MINSIZE);
    9393        return NULL;
    9494    }
  • branches/1.2/xcache.c

    r389 r392  
    15611561    }
    15621562    if (strlen(admin_pass) != 32) {
    1563         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));
     1563        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));
    15641564        zend_bailout();
    15651565    }
Note: See TracChangeset for help on using the changeset viewer.