com php-src: fixed sysvshm: ext/sysvshm/php_sysvshm.h ext /sysvshm/sysvshm.c
| From: | Anatol Belski | Date: | Wed, 20 Aug 2014 16:44:43 +0000 |
| Subject: | com php-src: fixed sysvshm: ext/sysvshm/php_sysvshm.h ext /sysvshm/sysvshm.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80719@lists.php.net to get a copy of this message | ||
Commit: 49b65d0d65325518098139795697cf98c377e661
Author: Anatol Belski <ab@php.net> Wed, 20 Aug 2014 09:44:43 -0700
Parents: be1b1e7b414c41da2a0ad5ea80674fc625ceb8b4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=49b65d0d65325518098139795697cf98c377e661
Log:
fixed sysvshm
Changed paths:
M ext/sysvshm/php_sysvshm.h
M ext/sysvshm/sysvshm.c
Diff:
diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h
index dad18ad...359c9f7 100644
--- a/ext/sysvshm/php_sysvshm.h
+++ b/ext/sysvshm/php_sysvshm.h
@@ -46,10 +46,10 @@ typedef struct {
typedef struct {
char magic[8];
- long start;
- long end;
- long free;
- long total;
+ php_int_t start;
+ php_int_t end;
+ php_int_t free;
+ php_int_t total;
} sysvshm_chunk_head;
typedef struct {
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 4b97a87..97fa4df 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -346,7 +346,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 TSRMLS_CC, E_WARNING, "variable key %id doesn't exist",
shm_key);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "variable key %pd doesn't exist",
shm_key);
RETURN_FALSE;
}
php_remove_shm_data((shm_list_ptr->ptr), shm_varpos);