cvs: /php4/ext/ldap ldap.c php_ldap.h

zeev Sat Dec 18 06:50:02 1999 EDT Modified files: /php4/ext/ldap ldap.c php_ldap.h Log: More php3_ cleanup Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.19 php4/ext/ldap/ldap.c:1.20 --- php4/ext/ldap/ldap.c:1.19 Fri Dec 17 15:55:08 1999 +++ php4/ext/ldap/ldap.c Sat Dec 18 06:49:31 1999 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.19 1999/12/17 20:55:08 zeev Exp $ */ +/* $Id: ldap.c,v 1.20 1999/12/18 11:49:31 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -50,12 +50,12 @@ #if THREAD_SAFE & HAVE_NSLDAP #include "php3_threads.h" /* Structure for LDAP error values */ -#define LDAP_TLS_VARS ldap_module *PHP3_TLS_GET(ldapTLS,php3_ldap_module) -#define LDAP_GLOBAL(a) php3_ldap_module->a +#define LDAP_TLS_VARS ldap_module *PHP3_TLS_GET(ldapTLS,php_ldap_module) +#define LDAP_GLOBAL(a) php_ldap_module->a #else #define LDAP_TLS_VARS -#define LDAP_GLOBAL(a) php3_ldap_module.a -ldap_module php3_ldap_module; +#define LDAP_GLOBAL(a) php_ldap_module.a +ldap_module php_ldap_module; #endif @@ -111,7 +111,7 @@ #if 0 /* see my note in php_ldap.h. smc */ /* Function for setting thread-specific LDAP error values */ -static void php3_ldap_set_ld_error( int err, char *matched, char *errmsg, void *dummy ) +static void php_ldap_set_ld_error( int err, char *matched, char *errmsg, void *dummy ) { LDAP_TLS_VARS; @@ -131,7 +131,7 @@ } /* Function for getting the thread-specific LDAP error values */ -static int php3_ldap_get_ld_error( char **matched, char **errmsg, void *dummy ) +static int php_ldap_get_ld_error( char **matched, char **errmsg, void *dummy ) { LDAP_TLS_VARS; /* Retrieve the error values */ @@ -145,13 +145,13 @@ } /* Function for setting the value of the errno variable */ -static void php3_ldap_set_errno( int err ) +static void php_ldap_set_errno( int err ) { errno = err; } /* Function for getting the value of the errno variable */ -static int php3_ldap_get_errno( void ) +static int php_ldap_get_errno( void ) { return( errno ); } @@ -174,7 +174,7 @@ PHP_MINIT_FUNCTION(ldap) { #if defined(THREAD_SAFE) - ldap_module *php3_ldap_module; + ldap_module *php_ldap_module; PHP3_MUTEX_ALLOC(ldap_mutex); PHP3_MUTEX_LOCK(ldap_mutex); numthreads++; @@ -186,7 +186,7 @@ } } PHP3_MUTEX_UNLOCK(ldap_mutex); - if(!PHP3_TLS_THREAD_INIT(ldapTLS,php3_ldap_module,ldap_module)) + if(!PHP3_TLS_THREAD_INIT(ldapTLS,php_ldap_module,ldap_module)) return 0; #if 0 /*HAVE_NSLDAP*/ /* Set up the ldap_thread_fns structure with pointers @@ -206,15 +206,15 @@ thread needs to unlock a mutex. */ LDAP_GLOBAL(tfns).ltf_mutex_unlock = (int (*)(void *)) php3_mutex_unlock; /* Call the get_errno() function to get the value of errno */ - LDAP_GLOBAL(tfns).ltf_get_errno = php3_ldap_get_errno; + LDAP_GLOBAL(tfns).ltf_get_errno = php_ldap_get_errno; /* Call the set_errno() function to set the value of errno */ - LDAP_GLOBAL(tfns).ltf_set_errno = php3_ldap_set_errno; + LDAP_GLOBAL(tfns).ltf_set_errno = php_ldap_set_errno; /* Call the get_ld_error() function to get error values from calls to functions in the libldap library */ - LDAP_GLOBAL(tfns).ltf_get_lderrno = php3_ldap_get_ld_error; + LDAP_GLOBAL(tfns).ltf_get_lderrno = php_ldap_get_ld_error; /* Call the set_ld_error() function to set error values for calls to functions in the libldap library */ - LDAP_GLOBAL(tfns).ltf_set_lderrno = php3_ldap_set_ld_error; + LDAP_GLOBAL(tfns).ltf_set_lderrno = php_ldap_set_ld_error; /* Don't pass any extra parameter to the functions for getting and setting libldap function call errors */ LDAP_GLOBAL(tfns).ltf_lderrno_arg = NULL; @@ -245,7 +245,7 @@ { #ifdef THREAD_SAFE LDAP_TLS_VARS; - PHP3_TLS_THREAD_FREE(php3_ldap_module); + PHP3_TLS_THREAD_FREE(php_ldap_module); PHP3_MUTEX_LOCK(ldap_mutex); numthreads--; if (!numthreads) { @@ -277,7 +277,7 @@ php_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.19 1999/12/17 20:55:08 zeev Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.20 1999/12/18 11:49:31 zeev Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" @@ -537,7 +537,7 @@ /* }}} */ -static void php3_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) +static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) { pval **link, **base_dn, **filter, **attrs, **attr; char *ldap_base_dn, *ldap_filter; @@ -642,7 +642,7 @@ Read an entry */ PHP_FUNCTION(ldap_read) { - php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_BASE); + php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_BASE); } /* }}} */ @@ -650,7 +650,7 @@ Single-level search */ PHP_FUNCTION(ldap_list) { - php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_ONELEVEL); + php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_ONELEVEL); } /* }}} */ @@ -659,7 +659,7 @@ Search LDAP tree under base_dn */ PHP_FUNCTION(ldap_search) { - php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_SUBTREE); + php_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_SUBTREE); } /* }}} */ @@ -1122,7 +1122,7 @@ #define PHP_LD_FULL_ADD 0xff -static void php3_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper) +static void php_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper) { pval **link, **dn, **entry, **value, **ivalue; LDAP *ldap; @@ -1231,8 +1231,8 @@ PHP_FUNCTION(ldap_add) { /* use a newly define parameter into the do_modify so ldap_mod_add can be used the way it is supposed to be used , Gerrit THomson */ - /* php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD);*/ - php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_LD_FULL_ADD); + /* php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD);*/ + php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_LD_FULL_ADD); } /* }}} */ @@ -1241,7 +1241,7 @@ Modify an LDAP entry */ PHP_FUNCTION(ldap_modify) { - php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE); + php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE); } /* }}} */ @@ -1254,14 +1254,14 @@ Replace attribute values with new ones */ PHP_FUNCTION(ldap_mod_replace) { - php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE);} + php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE);} /* }}} */ /* {{{ proto int ldap_mod_add(int link, string dn, array entry) Add attribute values to current */ PHP_FUNCTION(ldap_mod_add) { - php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD); + php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD); } /* }}} */ @@ -1269,7 +1269,7 @@ Delete attribute values */ PHP_FUNCTION(ldap_mod_del) { - php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE); + php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_DELETE); } /* end of attribute based functions , gerrit thomson */ Index: php4/ext/ldap/php_ldap.h diff -u php4/ext/ldap/php_ldap.h:1.2 php4/ext/ldap/php_ldap.h:1.3 --- php4/ext/ldap/php_ldap.h:1.2 Fri Dec 17 15:55:08 1999 +++ php4/ext/ldap/php_ldap.h Sat Dec 18 06:49:31 1999 @@ -29,7 +29,7 @@ */ -/* $Id: php_ldap.h,v 1.2 1999/12/17 20:55:08 zeev Exp $ */ +/* $Id: php_ldap.h,v 1.3 1999/12/18 11:49:31 zeev Exp $ */ #ifndef _PHP_LDAP_H #define _PHP_LDAP_H @@ -113,7 +113,7 @@ } ldap_module; #ifndef THREAD_SAFE -extern ldap_module php3_ldap_module; +extern ldap_module php_ldap_module; #endif #else