diff options
author | Dmitry Stogov <dmitry@zend.com> | 2016-06-21 16:00:37 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-21 16:00:37 +0300 |
commit | 16160386982a86e6ec7969c6c89707d38228f19e (patch) | |
tree | 47052539a23ab7d6d2cf79392dd1e47de67bb2f1 /ext/sysvshm | |
parent | 67e23f4be3c01a389043ee97b98d6bcc703d3557 (diff) | |
download | php-git-16160386982a86e6ec7969c6c89707d38228f19e.tar.gz |
Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
Diffstat (limited to 'ext/sysvshm')
-rw-r--r-- | ext/sysvshm/sysvshm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 2ecb19dd0f..55381dbbed 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -170,19 +170,19 @@ PHP_FUNCTION(shm_attach) /* get the id from a specified key or create new shared memory */ if ((shm_id = shmget(shm_key, 0, 0)) < 0) { if (shm_size < sizeof(sysvshm_chunk_head)) { - php_error_docref(NULL, E_WARNING, "failed for key 0x%px: memorysize too small", shm_key); + php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": memorysize too small", shm_key); efree(shm_list_ptr); RETURN_FALSE; } if ((shm_id = shmget(shm_key, shm_size, shm_flag | IPC_CREAT | IPC_EXCL)) < 0) { - php_error_docref(NULL, E_WARNING, "failed for key 0x%px: %s", shm_key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": %s", shm_key, strerror(errno)); efree(shm_list_ptr); RETURN_FALSE; } } if ((shm_ptr = shmat(shm_id, NULL, 0)) == (void *) -1) { - php_error_docref(NULL, E_WARNING, "failed for key 0x%px: %s", shm_key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_LONG_FMT ": %s", shm_key, strerror(errno)); efree(shm_list_ptr); RETURN_FALSE; } @@ -233,7 +233,7 @@ PHP_FUNCTION(shm_remove) SHM_FETCH_RESOURCE(shm_list_ptr, shm_id); if (shmctl(shm_list_ptr->id, IPC_RMID, NULL) < 0) { - php_error_docref(NULL, E_WARNING, "failed for key 0x%x, id %ld: %s", shm_list_ptr->key, Z_LVAL_P(shm_id), strerror(errno)); + php_error_docref(NULL, E_WARNING, "failed for key 0x%x, id " ZEND_LONG_FMT ": %s", shm_list_ptr->key, Z_LVAL_P(shm_id), strerror(errno)); RETURN_FALSE; } @@ -303,7 +303,7 @@ PHP_FUNCTION(shm_get_var) shm_varpos = php_check_shm_data((shm_list_ptr->ptr), shm_key); if (shm_varpos < 0) { - php_error_docref(NULL, E_WARNING, "variable key %pd doesn't exist", shm_key); + php_error_docref(NULL, E_WARNING, "variable key " ZEND_LONG_FMT " doesn't exist", shm_key); RETURN_FALSE; } shm_var = (sysvshm_chunk*) ((char *)shm_list_ptr->ptr + shm_varpos); @@ -350,7 +350,7 @@ PHP_FUNCTION(shm_remove_var) shm_varpos = php_check_shm_data((shm_list_ptr->ptr), shm_key); if (shm_varpos < 0) { - php_error_docref(NULL, E_WARNING, "variable key %pd doesn't exist", shm_key); + php_error_docref(NULL, E_WARNING, "variable key " ZEND_LONG_FMT " doesn't exist", shm_key); RETURN_FALSE; } php_remove_shm_data((shm_list_ptr->ptr), shm_varpos); |