Rename symbols whose first character was an underscore.

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 2c7e9c71172e4917956232969fe25b3752a4516d..dbb5f6929042b87a7120f896200c6f4c2964f5ab 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -54,7 +54,7 @@ ps_module ps_mod_files = {
        PS_MOD(files)
 };
 
-static int _ps_files_valid_key(const char *key)
+static int ps_files_valid_key(const char *key)
 {
        size_t len;
        const char *p;
@@ -79,7 +79,7 @@ static int _ps_files_valid_key(const char *key)
        return ret;
 }
 
-static char *_ps_files_path_create(char *buf, size_t buflen, ps_files *data, const char *key)
+static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, const char *key)
 {
        int keylen;
        const char *p;
@@ -107,7 +107,7 @@ static char *_ps_files_path_create(char *buf, size_t buflen, ps_files *data, con
 #define O_BINARY 0
 #endif 
 
-static void _ps_files_open(ps_files *data, const char *key)
+static void ps_files_open(ps_files *data, const char *key)
 {
        char buf[MAXPATHLEN];
 
@@ -121,8 +121,8 @@ static void _ps_files_open(ps_files *data, const char *key)
                        data->fd = -1;
                }
                
-               if (!_ps_files_valid_key(key) || 
-                               !_ps_files_path_create(buf, sizeof(buf), data, key))
+               if (!ps_files_valid_key(key) || 
+                               !ps_files_path_create(buf, sizeof(buf), data, key))
                        return;
                
                data->lastkey = estrdup(key);
@@ -147,7 +147,7 @@ static void _ps_files_open(ps_files *data, const char *key)
        }
 }
 
-static int _ps_files_cleanup_dir(const char *dirname, int maxlifetime)
+static int ps_files_cleanup_dir(const char *dirname, int maxlifetime)
 {
        DIR *dir;
        char dentry[sizeof(struct dirent) + MAXPATHLEN + 1];
@@ -159,7 +159,7 @@ static int _ps_files_cleanup_dir(const char *dirname, int maxlifetime)
 
        dir = opendir(dirname);
        if (!dir) {
-               php_error(E_NOTICE, "_ps_files_cleanup_dir: opendir(%s) failed: %m (%d)\n", dirname, errno);
+               php_error(E_NOTICE, "ps_files_cleanup_dir: opendir(%s) failed: %m (%d)\n", dirname, errno);
                return (0);
        }
 
@@ -226,7 +226,7 @@ PS_READ_FUNC(files)
        struct stat sbuf;
        PS_FILES_DATA;
 
-       _ps_files_open(data, key);
+       ps_files_open(data, key);
        if (data->fd < 0)
                return FAILURE;
        
@@ -251,7 +251,7 @@ PS_WRITE_FUNC(files)
 {
        PS_FILES_DATA;
 
-       _ps_files_open(data, key);
+       ps_files_open(data, key);
        if (data->fd < 0)
                return FAILURE;
 
@@ -270,7 +270,7 @@ PS_DESTROY_FUNC(files)
        char buf[MAXPATHLEN];
        PS_FILES_DATA;
 
-       if (!_ps_files_path_create(buf, sizeof(buf), data, key))
+       if (!ps_files_path_create(buf, sizeof(buf), data, key))
                return FAILURE;
        
        if (V_UNLINK(buf) == -1) {
@@ -289,7 +289,7 @@ PS_GC_FUNC(files)
           an external entity (i.e. find -ctime x | xargs rm) */
           
        if (data->dirdepth == 0)
-               *nrdels = _ps_files_cleanup_dir(data->basedir, maxlifetime);
+               *nrdels = ps_files_cleanup_dir(data->basedir, maxlifetime);
        
        return SUCCESS;
 }

diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index b20967ead608c4270e2bfff7e11df1479985f00b..e489be780c366ed48329e635d24acbe29f18fcfd 100644 (file)
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -50,12 +50,12 @@ typedef struct ps_module_struct {
 #define PS_GET_MOD_DATA() *mod_data
 #define PS_SET_MOD_DATA(a) *mod_data = (a)
 
-#define PS_OPEN_FUNC(x)        int _ps_open_##x(PS_OPEN_ARGS)
-#define PS_CLOSE_FUNC(x)       int _ps_close_##x(PS_CLOSE_ARGS)
-#define PS_READ_FUNC(x)        int _ps_read_##x(PS_READ_ARGS)
-#define PS_WRITE_FUNC(x)       int _ps_write_##x(PS_WRITE_ARGS)
-#define PS_DESTROY_FUNC(x)     int _ps_delete_##x(PS_DESTROY_ARGS)
-#define PS_GC_FUNC(x)          int _ps_gc_##x(PS_GC_ARGS)
+#define PS_OPEN_FUNC(x)        int ps_open_##x(PS_OPEN_ARGS)
+#define PS_CLOSE_FUNC(x)       int ps_close_##x(PS_CLOSE_ARGS)
+#define PS_READ_FUNC(x)        int ps_read_##x(PS_READ_ARGS)
+#define PS_WRITE_FUNC(x)       int ps_write_##x(PS_WRITE_ARGS)
+#define PS_DESTROY_FUNC(x)     int ps_delete_##x(PS_DESTROY_ARGS)
+#define PS_GC_FUNC(x)          int ps_gc_##x(PS_GC_ARGS)
 
 #define PS_FUNCS(x) \
        PS_OPEN_FUNC(x); \
@@ -67,8 +67,8 @@ typedef struct ps_module_struct {
 
 
 #define PS_MOD(x) \
-       #x, _ps_open_##x, _ps_close_##x, _ps_read_##x, _ps_write_##x, \
-        _ps_delete_##x, _ps_gc_##x 
+       #x, ps_open_##x, ps_close_##x, ps_read_##x, ps_write_##x, \
+        ps_delete_##x, ps_gc_##x 
 
 typedef struct {
        char *save_path;
@@ -142,16 +142,16 @@ typedef struct ps_serializer_struct {
 } ps_serializer;
 
 #define PS_SERIALIZER_ENCODE_FUNC(x) \
-       int _ps_srlzr_encode_##x(PS_SERIALIZER_ENCODE_ARGS)
+       int ps_srlzr_encode_##x(PS_SERIALIZER_ENCODE_ARGS)
 #define PS_SERIALIZER_DECODE_FUNC(x) \
-       int _ps_srlzr_decode_##x(PS_SERIALIZER_DECODE_ARGS)
+       int ps_srlzr_decode_##x(PS_SERIALIZER_DECODE_ARGS)
 
 #define PS_SERIALIZER_FUNCS(x) \
        PS_SERIALIZER_ENCODE_FUNC(x); \
        PS_SERIALIZER_DECODE_FUNC(x)
 
 #define PS_SERIALIZER_ENTRY(x) \
-       { #x, _ps_srlzr_encode_##x, _ps_srlzr_decode_##x }
+       { #x,ps_srlzr_encode_##x, ps_srlzr_decode_##x }
 
 #ifdef TRANS_SID
 void session_adapt_uris(const char *, uint, char **, uint *);
@@ -159,8 +159,8 @@ void session_adapt_uris(const char *, uint, char **, uint *);
 #define session_adapt_uris(a,b,c,d)
 #endif
 
-void _php_session_auto_start(void *data);
-void _php_session_shutdown(void *data);
+void php_session_auto_start(void *data);
+void php_session_shutdown(void *data);
 
 #if HAVE_WDDX
 #define WDDX_SERIALIZER

diff --git a/ext/session/session.c b/ext/session/session.c
index d0491b6e0fff81110bf05322981612dab53fd8f9..d643a1ff738c16ddd0482969cf36923df737e339 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -141,7 +141,7 @@ PHP_MINFO_FUNCTION(session);
 
 static void php_rinit_session_globals(PSLS_D);
 static void php_rshutdown_session_globals(PSLS_D);
-static zend_bool _php_session_destroy(PSLS_D);
+static zend_bool php_session_destroy(PSLS_D);
 
 zend_module_entry session_module_entry = {
        "session",
@@ -159,7 +159,7 @@ ZEND_GET_MODULE(session)
 typedef struct {
        char *name;
        void (*func)(PSLS_D);
-} php_session_cache_limiter;
+} php_session_cache_limiter_t;
 
 #define CACHE_LIMITER_FUNC(name) static void _php_cache_limiter_##name(PSLS_D)
 #define CACHE_LIMITER(name) { #name, _php_cache_limiter_##name },
@@ -485,7 +485,7 @@ static void php_session_track_init(void)
        }
 }
 
-static char *_php_session_encode(int *newlen PSLS_DC)
+static char *php_session_encode(int *newlen PSLS_DC)
 {
        char *ret = NULL;
 
@@ -495,13 +495,13 @@ static char *_php_session_encode(int *newlen PSLS_DC)
        return ret;
 }
 
-static void _php_session_decode(const char *val, int vallen PSLS_DC)
+static void php_session_decode(const char *val, int vallen PSLS_DC)
 {
        PLS_FETCH();
 
        php_session_track_init();
        if (PS(serializer)->decode(val, vallen PSLS_CC) == FAILURE) {
-               _php_session_destroy(PSLS_C);
+               php_session_destroy(PSLS_C);
                php_error(E_WARNING, "Failed to decode session object. Session has been destroyed.");
        }
 }
@@ -549,7 +549,7 @@ static char *_php_create_id(int *newlen PSLS_DC)
        return estrdup(buf);
 }
 
-static void _php_session_initialize(PSLS_D)
+static void php_session_initialize(PSLS_D)
 {
        char *val;
        int vallen;
@@ -559,12 +559,12 @@ static void _php_session_initialize(PSLS_D)
                return;
        }
        if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen) == SUCCESS) {
-               _php_session_decode(val, vallen PSLS_CC);
+               php_session_decode(val, vallen PSLS_CC);
                efree(val);
        }
 }
 
-static void _php_session_save_current_state(PSLS_D)
+static void php_session_save_current_state(PSLS_D)
 {
        char *val;
        int vallen;
@@ -585,7 +585,7 @@ static void _php_session_save_current_state(PSLS_D)
          }
        }
 
-       val = _php_session_encode(&vallen PSLS_CC);
+       val = php_session_encode(&vallen PSLS_CC);
        if (val) {
                ret = PS(mod)->write(&PS(mod_data), PS(id), val, vallen);
                efree(val);
@@ -680,16 +680,16 @@ CACHE_LIMITER_FUNC(nocache)
        ADD_COOKIE("Pragma: no-cache");
 }
 
-static php_session_cache_limiter php_session_cache_limiters[] = {
+static php_session_cache_limiter_t php_session_cache_limiters[] = {
        CACHE_LIMITER(public)
        CACHE_LIMITER(private)
        CACHE_LIMITER(nocache)
        {0}
 };
 
-static int _php_session_cache_limiter(PSLS_D)
+static int php_session_cache_limiter(PSLS_D)
 {
-       php_session_cache_limiter *lim;
+       php_session_cache_limiter_t *lim;
        SLS_FETCH();
 
        if (SG(headers_sent)) {
@@ -720,7 +720,7 @@ static int _php_session_cache_limiter(PSLS_D)
 #define COOKIE_PATH            "; path="
 #define COOKIE_DOMAIN  "; domain="
 
-static void _php_session_send_cookie(PSLS_D)
+static void php_session_send_cookie(PSLS_D)
 {
        int len;
        int pathlen;
@@ -812,7 +812,7 @@ static const ps_serializer *_php_find_ps_serializer(char *name PSLS_DC)
                convert_to_string((*ppid)); \
                PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid))
 
-static void _php_session_start(PSLS_D)
+static void php_session_start(PSLS_D)
 {
        pval **ppid;
        pval **data;
@@ -907,7 +907,7 @@ static void _php_session_start(PSLS_D)
        }
        
        if (send_cookie)
-               _php_session_send_cookie(PSLS_C);
+               php_session_send_cookie(PSLS_C);
        
        if (define_sid) {
                char *buf;
@@ -921,8 +921,8 @@ static void _php_session_start(PSLS_D)
 
        PS(nr_open_sessions)++;
 
-       _php_session_cache_limiter(PSLS_C);
-       _php_session_initialize(PSLS_C);
+       php_session_cache_limiter(PSLS_C);
+       php_session_initialize(PSLS_C);
 
        if (PS(mod_data) && PS(gc_probability) > 0) {
                int nrdels = -1;
@@ -937,7 +937,7 @@ static void _php_session_start(PSLS_D)
        }
 }
 
-static zend_bool _php_session_destroy(PSLS_D)
+static zend_bool php_session_destroy(PSLS_D)
 {
        zend_bool retval = SUCCESS;
 
@@ -1212,7 +1212,7 @@ PHP_FUNCTION(session_register)
        }
 
        if (PS(nr_open_sessions) == 0)
-               _php_session_start(PSLS_C);
+               php_session_start(PSLS_C);
 
        for (i = 0; i < argc; i++) {
                if (Z_TYPE_PP(args[i]) == IS_ARRAY)
@@ -1277,7 +1277,7 @@ PHP_FUNCTION(session_encode)
        char *enc;
        PSLS_FETCH();
 
-       enc = _php_session_encode(&len PSLS_CC);
+       enc = php_session_encode(&len PSLS_CC);
        RETVAL_STRINGL(enc, len, 0);
 }
 /* }}} */
@@ -1294,7 +1294,7 @@ PHP_FUNCTION(session_decode)
 
        convert_to_string_ex(str);
 
-       _php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) PSLS_CC);
+       php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) PSLS_CC);
 }
 /* }}} */
 
@@ -1304,7 +1304,7 @@ PHP_FUNCTION(session_start)
 {
        PSLS_FETCH();
 
-       _php_session_start(PSLS_C);
+       php_session_start(PSLS_C);
 
        RETURN_TRUE;
 }
@@ -1316,7 +1316,7 @@ PHP_FUNCTION(session_destroy)
 {
        PSLS_FETCH();
 
-       if (_php_session_destroy(PSLS_C) == SUCCESS) {
+       if (php_session_destroy(PSLS_C) == SUCCESS) {
                RETURN_TRUE;
        } else {
                RETURN_FALSE;
@@ -1393,7 +1393,7 @@ PHP_RINIT_FUNCTION(session)
        }
 
        if (PS(auto_start)) {
-               _php_session_start(PSLS_C);
+               php_session_start(PSLS_C);
        }
 
        return SUCCESS;
@@ -1405,7 +1405,7 @@ PHP_RSHUTDOWN_FUNCTION(session)
        PSLS_FETCH();
 
        if (PS(nr_open_sessions) > 0) {
-               _php_session_save_current_state(PSLS_C);
+               php_session_save_current_state(PSLS_C);
                PS(nr_open_sessions)--;
        }
        php_rshutdown_session_globals(PSLS_C);