sniper Thu Mar 6 19:52:04 2003 EDT
Modified files:
/php4/ext/sysvshm php_sysvshm.h sysvshm.c
Log:
WS CS fixes
Index: php4/ext/sysvshm/php_sysvshm.h
diff -u php4/ext/sysvshm/php_sysvshm.h:1.12 php4/ext/sysvshm/php_sysvshm.h:1.13
--- php4/ext/sysvshm/php_sysvshm.h:1.12 Tue Dec 31 11:08:00 2002
+++ php4/ext/sysvshm/php_sysvshm.h Thu Mar 6 19:52:04 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_sysvshm.h,v 1.12 2002/12/31 16:08:00 sebastian Exp $ */
+/* $Id: php_sysvshm.h,v 1.13 2003/03/07 00:52:04 sniper Exp $ */
#ifndef PHP_SYSVSHM_H
#define PHP_SYSVSHM_H
@@ -35,7 +35,6 @@
long init_mem;
} sysvshm_module;
-
typedef struct {
long key;
long length;
@@ -43,7 +42,6 @@
char mem;
} sysvshm_chunk;
-
typedef struct {
char magic[8];
long start;
@@ -52,15 +50,12 @@
long total;
} sysvshm_chunk_head;
-
typedef struct {
- key_t key; /* Key set by user */
- long id;/* Returned by shmget. */
- sysvshm_chunk_head *ptr;/* memoryaddress of shared
memory */
+ key_t key; /* Key set by user */
+ long id; /* Returned by shmget. */
+ sysvshm_chunk_head *ptr; /* memoryaddress of shared memory */
} sysvshm_shm;
-
-
PHP_MINIT_FUNCTION(sysvshm);
PHP_FUNCTION(shm_attach);
PHP_FUNCTION(shm_detach);
@@ -68,9 +63,10 @@
PHP_FUNCTION(shm_put_var);
PHP_FUNCTION(shm_get_var);
PHP_FUNCTION(shm_remove_var);
-int php_put_shm_data(sysvshm_chunk_head *ptr,long key,char *data, long len);
-long php_check_shm_data(sysvshm_chunk_head *ptr, long key);
-int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos);
+
+static int php_put_shm_data(sysvshm_chunk_head *ptr,long key,char *data, long len);
+static long php_check_shm_data(sysvshm_chunk_head *ptr, long key);
+static int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos);
extern sysvshm_module php_sysvshm;
Index: php4/ext/sysvshm/sysvshm.c
diff -u php4/ext/sysvshm/sysvshm.c:1.60 php4/ext/sysvshm/sysvshm.c:1.61
--- php4/ext/sysvshm/sysvshm.c:1.60 Tue Jan 21 12:37:59 2003
+++ php4/ext/sysvshm/sysvshm.c Thu Mar 6 19:52:04 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvshm.c,v 1.60 2003/01/21 17:37:59 andrey Exp $ */
+/* $Id: sysvshm.c,v 1.61 2003/03/07 00:52:04 sniper Exp $ */
/* This has been built and tested on Linux 2.2.14
*
@@ -79,8 +79,8 @@
*/
static void php_release_sysvshm(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
- sysvshm_shm *shm_ptr = (sysvshm_shm *)rsrc-ptr;
- shmdt((void*) shm_ptr-ptr);
+ sysvshm_shm *shm_ptr = (sysvshm_shm *) rsrc-ptr;
+ shmdt((void *) shm_ptr-ptr);
efree(shm_ptr);
}
/* }}} */
@@ -88,11 +88,12 @@
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(sysvshm)
-{
+{
php_sysvshm.le_shm = zend_register_list_destructors_ex(php_release_sysvshm,
NULL, sysvshm, module_number);
+
if (cfg_get_long(sysvshm.init_mem, php_sysvshm.init_mem) == FAILURE) {
php_sysvshm.init_mem=1;
- }
+ }
return SUCCESS;
}
/* }}} */
@@ -101,13 +102,13 @@
Creates or open a shared memory segment */
PHP_FUNCTION(shm_attach)
{
- pval **arg_key,**arg_size,**arg_flag;
- long shm_size,shm_flag;
+ zval **arg_key, **arg_size, **arg_flag;
+ long shm_size, shm_flag;
sysvshm_shm *shm_list_ptr;
char *shm_ptr;
sysvshm_chunk_head *chunk_ptr;
key_t shm_key = (key_t) 0;
- long shm_id,list_id;
+ long shm_id, list_id;
int ac = ZEND_NUM_ARGS();
shm_flag = 0666;
@@ -140,20 +141,20 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, failed for key
0x%x: memorysize too small, shm_key);
RETURN_FALSE;
}
- if ((shm_id = shmget(shm_key, shm_size, shm_flag |
IPC_CREAT|IPC_EXCL)) 0) {
+ if ((shm_id = shmget(shm_key, shm_size, shm_flag | IPC_CREAT |
IPC_EXCL)) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, failed for key
0x%x: %s, shm_key, strerror(errno));
RETURN_FALSE;
}
}
- if ((shm_ptr = shmat(shm_id,NULL,0)) == (void *)-1) {
+ if ((shm_ptr = shmat(shm_id, NULL, 0)) == (void *) - 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, failed for key 0x%x: %s,
shm_key, strerror(errno));
RETURN_FALSE;
}
/* check if shm is already initialized */
- chunk_ptr = (sysvshm_chunk_head*) shm_ptr;
- if (strcmp((char*) (chunk_ptr-magic), PHP_SM) !=0 ) {
+ chunk_ptr = (sysvshm_chunk_head *) shm_ptr;
+ if (strcmp((char*)
