Some constification & lint removal

diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index 29c55a284d4095bfa83c93c1662a7d7a770d80a5..c0c21bc88da4628f8368c64f783ea7c3be551b92 100644 (file)
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -161,7 +161,7 @@ ldap_matchingrule2str LDAP_P((
 
 LDAP_F( char *)
 ldap_scherr2str LDAP_P((
-       int code ));
+       int code )) LDAP_GCCATTR((const));
 
 LDAP_END_DECL
 

diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index ffbe2bd2560c4214da98379586cbc4ed3e5d3049..d3fb9a836cd3bf9b94054746440359856fc0008f 100644 (file)
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -1834,7 +1834,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
        }
 }
 
-static char *err2text[] = {
+static char *const err2text[] = {
        "",
        "Out of memory",
        "Unexpected token",

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index b554ede05a61921369c4dbca78d5a0ac68f2b4b6..93e8ee4d4638d14737631cdb382171244ff0a5a9 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -35,7 +35,9 @@ static unsigned long conn_nextid = 0;
 #define SLAP_C_BINDING                 0x03    /* binding */
 #define SLAP_C_CLOSING                 0x04    /* closing */
 
-char* connection_state2str( int state ) {
+const char *
+connection_state2str( int state )
+{
        switch( state ) {
        case SLAP_C_INVALID:    return "!";             
        case SLAP_C_INACTIVE:   return "|";             

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index feeabf55560d2adbd0b1a62c0432f52f17f1a524..4be7e9310c02292b09fb2f82d64aac81bdd9fc66 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -189,7 +189,7 @@ long connection_init LDAP_P((
 
 void connection_closing LDAP_P(( Connection *c ));
 int connection_state_closing LDAP_P(( Connection *c ));
-char *connection_state2str LDAP_P(( int state ));
+const char *connection_state2str LDAP_P(( int state )) LDAP_GCCATTR((const));
 
 int connection_write LDAP_P((ber_socket_t s));
 int connection_read LDAP_P((ber_socket_t s));
@@ -387,7 +387,7 @@ void parse_oc_old LDAP_P(( Backend *be, const char *fname, int lineno, int argc,
 void parse_oc LDAP_P(( const char *fname, int lineno, char *line, char **argv ));
 void parse_at LDAP_P(( const char *fname, int lineno, char *line, char **argv ));
 void parse_oidm LDAP_P(( const char *fname, int lineno, int argc, char **argv ));
-char *scherr2str LDAP_P((int code));
+char *scherr2str LDAP_P((int code)) LDAP_GCCATTR((const));
 int dscompare LDAP_P(( const char *s1, const char *s2del, char delim ));
 /*
  * str2filter.c

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 3f65bc41edac37afd10f8be36bbb898660216a76..f624b5dce81f7168727767ea399266d8fd9b8066 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -15,15 +15,13 @@
 #include "slap.h"
 #include "ldap_schema.h"
 
-static Avlnode         *object_classes = NULL;
-
 int    global_schemacheck = 1; /* schemacheck on is default */
 
 static void            oc_usage_old(void) LDAP_GCCATTR((noreturn));
 static void            oc_usage(void)     LDAP_GCCATTR((noreturn));
 static void            at_usage(void)     LDAP_GCCATTR((noreturn));
 
-static char *err2text[] = {
+static char *const err2text[] = {
        "",
        "Out of memory",
        "Objectclass not found",