skeleton of ldap_str2nd/dn2str; works with most of the simple cases, but there's...

[openldap] / libraries / libldap / tmpltest.c

diff --git a/libraries/libldap/tmpltest.c b/libraries/libldap/tmpltest.c
index a12643a152a099fc1b75360bea4e94a92207fc15..711884d9ac64db3126b2c8f372e2d70854bb42f3 100644 (file)
--- a/libraries/libldap/tmpltest.c
+++ b/libraries/libldap/tmpltest.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #include "portable.h"
@@ -13,12 +14,11 @@
 
 #ifdef HAVE_CONSOLE_H
 #include <console.h>
-#endif /* MACOS */
+#endif /* HAVE_CONSOLE_H */
 
-#include "lber.h"
-#include "ldap.h"
-#include "disptmpl.h"
-#include "srchpref.h"
+#include <ldap.h>
+#include <disptmpl.h>
+#include <srchpref.h>
 
 static void dump_tmpl   ( struct ldap_disptmpl *tmpl );
 static void dump_srchpref( struct ldap_searchobj *sp );
@@ -43,13 +43,13 @@ main( int argc, char **argv )
     if (( err = ldap_init_templates( "ldaptemplates.conf", &templates ))
            != 0 ) {
        fprintf( stderr, "ldap_init_templates failed (%d)\n", err );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     if (( err = ldap_init_searchprefs( "ldapsearchprefs.conf", &so ))
            != 0 ) {
        fprintf( stderr, "ldap_init_searchprefs failed (%d)\n", err );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     if ( argc == 1 ) {
@@ -79,7 +79,7 @@ main( int argc, char **argv )
     ldap_free_templates( templates );
     ldap_free_searchprefs( so );
 
-    exit( 0 );
+    exit( EXIT_SUCCESS );
 }
 
 
@@ -108,7 +108,7 @@ static const unsigned long item_opt_vals[] = {
 };
 
 
-void
+static void
 dump_tmpl( struct ldap_disptmpl *tmpl )
 {
     struct ldap_tmplitem       *rowp, *colp;
@@ -226,7 +226,7 @@ dump_tmpl( struct ldap_disptmpl *tmpl )
 }
 
 
-void
+static void
 dump_srchpref( struct ldap_searchobj *so )
 {
     int i;