Commit 4a5e2feb authored by Hallvard Furuseth's avatar Hallvard Furuseth
Browse files

Some constification & lint removal

parent 203f5b05
...@@ -161,7 +161,7 @@ ldap_matchingrule2str LDAP_P(( ...@@ -161,7 +161,7 @@ ldap_matchingrule2str LDAP_P((
LDAP_F( char *) LDAP_F( char *)
ldap_scherr2str LDAP_P(( ldap_scherr2str LDAP_P((
int code )); int code )) LDAP_GCCATTR((const));
LDAP_END_DECL LDAP_END_DECL
......
...@@ -1834,7 +1834,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp ) ...@@ -1834,7 +1834,7 @@ ldap_str2objectclass( const char * s, int * code, const char ** errp )
} }
} }
static char *err2text[] = { static char *const err2text[] = {
"", "",
"Out of memory", "Out of memory",
"Unexpected token", "Unexpected token",
......
...@@ -35,7 +35,9 @@ static unsigned long conn_nextid = 0; ...@@ -35,7 +35,9 @@ static unsigned long conn_nextid = 0;
#define SLAP_C_BINDING 0x03 /* binding */ #define SLAP_C_BINDING 0x03 /* binding */
#define SLAP_C_CLOSING 0x04 /* closing */ #define SLAP_C_CLOSING 0x04 /* closing */
char* connection_state2str( int state ) { const char *
connection_state2str( int state )
{
switch( state ) { switch( state ) {
case SLAP_C_INVALID: return "!"; case SLAP_C_INVALID: return "!";
case SLAP_C_INACTIVE: return "|"; case SLAP_C_INACTIVE: return "|";
......
...@@ -189,7 +189,7 @@ long connection_init LDAP_P(( ...@@ -189,7 +189,7 @@ long connection_init LDAP_P((
void connection_closing LDAP_P(( Connection *c )); void connection_closing LDAP_P(( Connection *c ));
int connection_state_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_write LDAP_P((ber_socket_t s));
int connection_read 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, ...@@ -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_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_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 )); 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 )); int dscompare LDAP_P(( const char *s1, const char *s2del, char delim ));
/* /*
* str2filter.c * str2filter.c
......
...@@ -15,15 +15,13 @@ ...@@ -15,15 +15,13 @@
#include "slap.h" #include "slap.h"
#include "ldap_schema.h" #include "ldap_schema.h"
static Avlnode *object_classes = NULL;
int global_schemacheck = 1; /* schemacheck on is default */ int global_schemacheck = 1; /* schemacheck on is default */
static void oc_usage_old(void) LDAP_GCCATTR((noreturn)); static void oc_usage_old(void) LDAP_GCCATTR((noreturn));
static void oc_usage(void) LDAP_GCCATTR((noreturn)); static void oc_usage(void) LDAP_GCCATTR((noreturn));
static void at_usage(void) LDAP_GCCATTR((noreturn)); static void at_usage(void) LDAP_GCCATTR((noreturn));
static char *err2text[] = { static char *const err2text[] = {
"", "",
"Out of memory", "Out of memory",
"Objectclass not found", "Objectclass not found",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment