cvs: /php3/functions ldap.c php3_ldap.h
| From: | Kristian K�hntopp | Date: | Fri, 10 Sep 1999 09:02:57 +0000 |
| Subject: | cvs: /php3/functions ldap.c php3_ldap.h | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-10794@lists.php.net to get a copy of this message | ||
kk Fri Sep 10 05:02:57 1999 EDT
Modified files:
/php3/functions ldap.c php3_ldap.h
Log:
LDAP error handling functions made official.
Index: php3/functions/ldap.c
diff -u php3/functions/ldap.c:1.72 php3/functions/ldap.c:1.73
--- php3/functions/ldap.c:1.72 Sat Aug 28 20:50:52 1999
+++ php3/functions/ldap.c Fri Sep 10 05:02:57 1999
@@ -30,7 +30,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.72 1999/08/29 00:50:52 jim Exp $ */
+/* $Id: ldap.c,v 1.73 1999/09/10 09:02:57 kk Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
@@ -131,7 +131,7 @@
/* additional functions for error handling, Kristian Koehntopp */
{"ldap_errno", php3_ldap_errno, NULL},
{"ldap_error", php3_ldap_error, NULL},
- {"ldap_str2err", php3_ldap_str2err, NULL},
+ {"ldap_err2str", php3_ldap_err2str, NULL},
/* end kk mod */
/* additional function that handles binary data, Stig Venaas */
{"ldap_get_values_len", php3_ldap_get_values_len, NULL},
@@ -318,7 +318,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.72 1999/08/29
00:50:52 jim Exp $</td></tr>\n"
+ "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.73 1999/09/10
09:02:57 kk 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>"
@@ -620,9 +620,9 @@
return_value->type = IS_STRING;
}
-/* {{{ proto string ldap_str2err(int errno)
+/* {{{ proto string ldap_err2str(int errno)
Convert error number to error string */
-void php3_ldap_str2err(INTERNAL_FUNCTION_PARAMETERS)
+void php3_ldap_err2str(INTERNAL_FUNCTION_PARAMETERS)
{
pval *perrno;
char *ld_error;
Index: php3/functions/php3_ldap.h
diff -u php3/functions/php3_ldap.h:1.27 php3/functions/php3_ldap.h:1.28
--- php3/functions/php3_ldap.h:1.27 Sat Aug 7 10:12:41 1999
+++ php3/functions/php3_ldap.h Fri Sep 10 05:02:57 1999
@@ -29,7 +29,7 @@
*/
-/* $Id: php3_ldap.h,v 1.27 1999/08/07 14:12:41 venaas Exp $ */
+/* $Id: php3_ldap.h,v 1.28 1999/09/10 09:02:57 kk Exp $ */
#ifndef _PHP3_LDAP_H
#define _PHP3_LDAP_H
@@ -90,7 +90,7 @@
extern void php3_ldap_mod_replace(INTERNAL_FUNCTION_PARAMETERS);
extern void php3_ldap_errno(INTERNAL_FUNCTION_PARAMETERS);
extern void php3_ldap_error(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ldap_str2err(INTERNAL_FUNCTION_PARAMETERS);
+extern void php3_ldap_err2str(INTERNAL_FUNCTION_PARAMETERS);
typedef struct {
long default_link;