CVS update: php3/functions

Date: Thursday July 1, 1999 @ 8:28 Author: sas Update of /repository/php3/functions In directory php:/tmp/cvs-serv24303/functions Modified Files: ldap.c Log Message: errno might be a macro, don't use it for your own variables. For example, in glibc 2.1 # define errno (*__errno_location ()) Index: php3/functions/ldap.c diff -u php3/functions/ldap.c:1.68 php3/functions/ldap.c:1.69 --- php3/functions/ldap.c:1.68 Thu Jul 1 05:15:33 1999 +++ php3/functions/ldap.c Thu Jul 1 08:28:16 1999 @@ -30,7 +30,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.68 1999/07/01 09:15:33 kk Exp $ */ +/* $Id: ldap.c,v 1.69 1999/07/01 12:28:16 sas Exp $ */ #define IS_EXT_MODULE #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE @@ -315,7 +315,7 @@ php3_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.68 1999/07/01 09:15:33 kk Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.69 1999/07/01 12:28:16 sas 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>" @@ -615,15 +615,15 @@ Convert error number to error string */ void php3_ldap_str2err(INTERNAL_FUNCTION_PARAMETERS) { -pval *errno; +pval *perrno; char *ld_error; - if (getParameters(ht, 1, &errno) == FAILURE) { + if (getParameters(ht, 1, &perrno) == FAILURE) { WRONG_PARAM_COUNT; } - convert_to_long(errno); + convert_to_long(perrno); - ld_error = ldap_err2string(errno->value.lval); + ld_error = ldap_err2string(perrno->value.lval); return_value->value.str.len = strlen(ld_error); return_value->value.str.val = estrndup(ld_error, strlen(ld_error));