+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
#include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
#include <ac/socket.h>
#include <ac/time.h>
#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 );
-#define NULLSTRINGIFNULL( s ) ( s == NULL ? "(null)" : s )
+#define NULLSTRINGIFNULL( s ) ( (s) == NULL ? "(null)" : (s) )
int
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 ) {
printf( "*** Display Templates:\n" );
- for ( dtp = ldap_first_disptmpl( templates ); dtp != NULLDISPTMPL;
+ for ( dtp = ldap_first_disptmpl( templates ); dtp != NULL;
dtp = ldap_next_disptmpl( templates, dtp )) {
dump_tmpl( dtp );
printf( "\n\n" );
}
printf( "\n\n*** Search Objects:\n" );
- for ( sop = ldap_first_searchobj( so ); sop != NULLSEARCHOBJ;
+ for ( sop = ldap_first_searchobj( so ); sop != NULL;
sop = ldap_next_searchobj( so, sop )) {
dump_srchpref( sop );
printf( "\n\n" );
ldap_free_templates( templates );
ldap_free_searchprefs( so );
- exit( 0 );
+ exit( EXIT_SUCCESS );
}
-static char *syn_name[] = {
+static const char *const syn_name[] = {
"?", "CIS", "MLS", "DN", "BOOL", "JPEG", "JPEGBTN", "FAX", "FAXBTN",
"AUDIOBTN", "TIME", "DATE", "URL", "SEARCHACT", "LINKACT", "ADDDNACT",
"VERIFYACT",
};
-static char *syn_type[] = {
+static const char *const syn_type[] = {
"?", "txt", "img", "?", "bool", "?", "?", "?", "btn",
"?", "?", "?", "?", "?", "?", "?",
"action", "?"
static char *includeattrs[] = { "objectClass", "sn", NULL };
-static char *item_opts[] = {
+static const char *const item_opts[] = {
"ro", "sort", "1val", "hide", "required", "hideiffalse", NULL
};
-static unsigned long item_opt_vals[] = {
+static const unsigned long item_opt_vals[] = {
LDAP_DITEM_OPT_READONLY, LDAP_DITEM_OPT_SORTVALUES,
LDAP_DITEM_OPT_SINGLEVALUED, LDAP_DITEM_OPT_HIDEIFEMPTY,
LDAP_DITEM_OPT_VALUEREQUIRED, LDAP_DITEM_OPT_HIDEIFFALSE,
};
-void
+static void
dump_tmpl( struct ldap_disptmpl *tmpl )
{
struct ldap_tmplitem *rowp, *colp;
printf( "\ntemplate items:\n" );
rowcnt = 0;
- for ( rowp = ldap_first_tmplrow( tmpl ); rowp != NULLTMPLITEM;
+ for ( rowp = ldap_first_tmplrow( tmpl ); rowp != NULL;
rowp = ldap_next_tmplrow( tmpl, rowp )) {
++rowcnt;
colcnt = 0;
- for ( colp = ldap_first_tmplcol( tmpl, rowp ); colp != NULLTMPLITEM;
+ for ( colp = ldap_first_tmplcol( tmpl, rowp ); colp != NULL;
colp = ldap_next_tmplcol( tmpl, rowp, colp )) {
++colcnt;
printf( " %2d-%d: %s (%s%s", rowcnt, colcnt,
}
-void
+static void
dump_srchpref( struct ldap_searchobj *so )
{
int i;