From 6b09ba64d0fea02795f0f014b57ad04782221534 Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Wed, 17 Feb 1999 02:05:28 +0000 Subject: [PATCH] Style changes, added cvs keywords --- servers/slapd/back-tcl/tcl_add.c | 4 ++ servers/slapd/back-tcl/tcl_bind.c | 4 ++ servers/slapd/back-tcl/tcl_compare.c | 4 ++ servers/slapd/back-tcl/tcl_delete.c | 4 ++ servers/slapd/back-tcl/tcl_modify.c | 4 ++ servers/slapd/back-tcl/tcl_modrdn.c | 4 ++ servers/slapd/back-tcl/tcl_search.c | 4 ++ servers/slapd/back-tcl/tcl_unbind.c | 4 ++ servers/slapd/back-tcl/tcl_util.c | 64 +++++++++++++++------------- 9 files changed, 66 insertions(+), 30 deletions(-) diff --git a/servers/slapd/back-tcl/tcl_add.c b/servers/slapd/back-tcl/tcl_add.c index cecc104b44..531ef0a390 100644 --- a/servers/slapd/back-tcl/tcl_add.c +++ b/servers/slapd/back-tcl/tcl_add.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" diff --git a/servers/slapd/back-tcl/tcl_bind.c b/servers/slapd/back-tcl/tcl_bind.c index 420fdf7e1e..f758bf7773 100644 --- a/servers/slapd/back-tcl/tcl_bind.c +++ b/servers/slapd/back-tcl/tcl_bind.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" diff --git a/servers/slapd/back-tcl/tcl_compare.c b/servers/slapd/back-tcl/tcl_compare.c index 96e0eaf8a0..599fa09239 100644 --- a/servers/slapd/back-tcl/tcl_compare.c +++ b/servers/slapd/back-tcl/tcl_compare.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" diff --git a/servers/slapd/back-tcl/tcl_delete.c b/servers/slapd/back-tcl/tcl_delete.c index 24771913b0..5b9a60ace4 100644 --- a/servers/slapd/back-tcl/tcl_delete.c +++ b/servers/slapd/back-tcl/tcl_delete.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" diff --git a/servers/slapd/back-tcl/tcl_modify.c b/servers/slapd/back-tcl/tcl_modify.c index 8b2c9147eb..d9d380157e 100644 --- a/servers/slapd/back-tcl/tcl_modify.c +++ b/servers/slapd/back-tcl/tcl_modify.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" diff --git a/servers/slapd/back-tcl/tcl_modrdn.c b/servers/slapd/back-tcl/tcl_modrdn.c index 59066b6db3..907cf369a1 100644 --- a/servers/slapd/back-tcl/tcl_modrdn.c +++ b/servers/slapd/back-tcl/tcl_modrdn.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" diff --git a/servers/slapd/back-tcl/tcl_search.c b/servers/slapd/back-tcl/tcl_search.c index ff0f6beb85..36796345f2 100644 --- a/servers/slapd/back-tcl/tcl_search.c +++ b/servers/slapd/back-tcl/tcl_search.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" diff --git a/servers/slapd/back-tcl/tcl_unbind.c b/servers/slapd/back-tcl/tcl_unbind.c index 14c775fca5..ac67581571 100644 --- a/servers/slapd/back-tcl/tcl_unbind.c +++ b/servers/slapd/back-tcl/tcl_unbind.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" diff --git a/servers/slapd/back-tcl/tcl_util.c b/servers/slapd/back-tcl/tcl_util.c index 1332ba8531..ad2dc9fda4 100644 --- a/servers/slapd/back-tcl/tcl_util.c +++ b/servers/slapd/back-tcl/tcl_util.c @@ -7,6 +7,10 @@ * as authorized by the OpenLDAP Public License. A copy of this * license is available at http://www.OpenLDAP.org/license.html or * in file LICENSE in the top-level directory of the distribution. + * + * $Id$ + * + * $Log$ */ #include "portable.h" @@ -95,47 +99,47 @@ interp_send_results( char *tcl_clean_entry (Entry *e) { - char *entrystr, *mark1, *mark2, *buf, *bp, *dup; - int len, bsize; + char *entrystr, *mark1, *mark2, *buf, *bp, *dup; + int len, bsize; - pthread_mutex_lock( &entry2str_mutex ); - entrystr = entry2str( e, &len, 0 ); - pthread_mutex_unlock( &entry2str_mutex ); + pthread_mutex_lock( &entry2str_mutex ); + entrystr = entry2str( e, &len, 0 ); + pthread_mutex_unlock( &entry2str_mutex ); - buf = (char *) ch_malloc( BUFSIZ ); - buf[0] = '\0'; - bsize = BUFSIZ; - bp = buf; - bp++[0] = ' '; + buf = (char *) ch_malloc( BUFSIZ ); + buf[0] = '\0'; + bsize = BUFSIZ; + bp = buf; + bp++[0] = ' '; - mark1 = entrystr; - do { + mark1 = entrystr; + do { if (mark1[0] == '\n') { - mark1++; + mark1++; } dup = (char *) strdup(mark1); - if (dup[0] != '\0') { - if ((mark2 = (char *) strchr (dup, '\n')) != NULL) { + if (dup[0] != '\0') { + if ((mark2 = (char *) strchr (dup, '\n')) != NULL) { mark2[0] = '\0'; - } - len = strlen( dup ) + 3; - while ( bp + len - buf > bsize ) { + } + len = strlen( dup ) + 3; + while ( bp + len - buf > bsize ) { bsize += BUFSIZ; buf = (char *) ch_realloc( buf, bsize ); - } - if (mark1[0] == '\0') { + } + if (mark1[0] == '\0') { sprintf(bp, "{} "); - } else { + } else { sprintf(bp, "{%s} ", dup); - } - bp += len; - if (mark2 != NULL) { + } + bp += len; + if (mark2 != NULL) { mark2[0] = '\n'; - } + } } free(dup); - } while ((mark1 = (char *) strchr (mark1, '\n')) != NULL); - return buf; + } while ((mark1 = (char *) strchr (mark1, '\n')) != NULL); + return buf; } int tcl_ldap_debug ( @@ -145,8 +149,8 @@ int tcl_ldap_debug ( char *argv[] ) { - if (argv[1] != NULL) { + if (argv[1] != NULL) { Debug(LDAP_DEBUG_ANY, "tcl_debug: %s\n", argv[1], 0, 0); - } - return TCL_OK; + } + return TCL_OK; } -- 2.39.5