more back-sql files + rdbms_dependent samples

[openldap] / contrib / saucer / main.c

diff --git a/contrib/saucer/main.c b/contrib/saucer/main.c
index 4435e0bfbbaed86d08e6b1ba51af6f284f466b93..a49a3bf896a84cdb3b7f6132807550603e26f586 100644 (file)
--- a/contrib/saucer/main.c
+++ b/contrib/saucer/main.c
@@ -20,7 +20,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #ifdef HAVE_READLINE
 #  include <readline/readline.h>
@@ -83,7 +84,7 @@ int           do_command(char *cmd);
 void           do_commands(FILE *file);
 int            is_whitespace(register char *s);
 char           *make_dn(char *dn, int relative);
-void           show_syntax(int cmdnum);
+void           show_syntax(unsigned int cmdnum);
 char           *skip_to_char(register char *s, register int c);
 char           *skip_to_whitespace(register char *s);
 char           *skip_whitespace(register char *s);
@@ -122,7 +123,7 @@ int bind_user(void)
 
 int cmd_help(char **cmdargv, int cmdargc)
 {
-       int             i;
+       unsigned int    i;
 
        if (cmdargc == 2) {
                for (i = 0; i < sizeof(cmdtable) / sizeof(cmdtable[0]); i++)
@@ -394,7 +395,6 @@ int cmd_set(char **cmdargv, int cmdargc)
 int cmd_show(char **cmdargv, int cmdargc)
 {
        char            *dn      = NULL;
-       LDAPMessage     *entry;
        int                     errflag  = 0;
        int                     i;
        static const char *const opts[] = { "absolute" };
@@ -449,7 +449,7 @@ void display_search_results(LDAPMessage *result)
        for (entry = ldap_first_entry(ld, result); entry; entry = ldap_next_entry(ld, entry)) {
                if (s = ldap_get_dn(ld, entry)) {
                        printf("  %s\n", s);
-                       free(s);
+                       ldap_memfree(s);
                }
 
                /* Make one pass to calculate the length of the longest attribute name */
@@ -614,7 +614,7 @@ int main(int argc, char **argv)
                case 'd':
 #ifdef LDAP_DEBUG
                        tmp = atoi(optarg);
-                       lber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &tmp);
+                       ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &tmp);
                        ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &tmp);
 #endif
                        break;
@@ -634,15 +634,15 @@ int main(int argc, char **argv)
        if (error_flag) {
                fprintf(stderr, "usage: %s [-h host] [-p portnumber] [-u X500UserName]\n\t[-c credentials] [-d debug-level]\n",
                                progname);
-               exit(2);
+               exit( EXIT_FAILURE );
        }
 
        rc = user_tailor();
 
-       if (!(ld = ldap_open(hostname, portnum))) {
-               fprintf(stderr, "%s: unable to connect to server at host `%s' on port %d\n",
+       if (!(ld = ldap_init(hostname, portnum))) {
+               fprintf(stderr, "%s: unable to initialize LDAP session (%s:%d)\n",
                                progname, hostname, portnum);
-               exit(2);
+               exit( EXIT_FAILURE );
        }
 
        if (!bind_user())
@@ -662,7 +662,6 @@ int main(int argc, char **argv)
 char *make_dn(char *dn, int relative)
 {
        static char     dn_buf[DN_MAXLEN];
-       char            *s;
 
        if (!dn)
                dn = "";
@@ -676,7 +675,7 @@ char *make_dn(char *dn, int relative)
        return strcat(strcat(strcpy(dn_buf, dn), ", "), default_dn);
 }
 
-void show_syntax(int cmdnum)
+void show_syntax(unsigned int cmdnum)
 {
        printf("Syntax: %s %s\n", cmdtable[cmdnum].cmd, cmdtable[cmdnum].help_msg);
 }