Introduce and use LDAP_GCCATTR() = __attributes__() in gcc

diff --git a/clients/fax500/main.c b/clients/fax500/main.c
index 5bc84f2fb8efed7a7f7afa7ab44f8040b994ef28..84cded263e398081699c5140a7a98ff36404ef4f 100644 (file)
--- a/clients/fax500/main.c
+++ b/clients/fax500/main.c
@@ -121,7 +121,7 @@ static void add_to(char ***list, int *nlist, char **new);
 static int  isgroup(LDAPMessage *e);
 static void add_error(Error **err, int *nerr, int code, char *addr, LDAPMessage *msg);
 static void add_group(char *dn, Group **list, int *nlist);
-static void unbind_and_exit(int rc);
+static void unbind_and_exit(int rc) LDAP_GCCATTR((noreturn));
 static int  group_loop(char *dn);
 static void send_group(Group *group, int ngroup);
 static int  has_attributes(LDAPMessage *e, char *attr1, char *attr2);

diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c
index 9bf49a252c5ace7b760b13e62698405c6e9861ef..a7e9b868be87aecb3dceec9509cdf50ec78b30d8 100644 (file)
--- a/clients/gopher/go500.c
+++ b/clients/gopher/go500.c
@@ -62,10 +62,10 @@ char        *templatefile = TEMPLATEFILE;
 char   myhost[MAXHOSTNAMELEN];
 int    myport;
 
-static void usage      ( char *name );
+static void usage      ( char *name ) LDAP_GCCATTR((noreturn));
 static int  set_socket (int port);
 static RETSIGTYPE wait4child(int sig);
-static void do_queries (int s);
+static void do_queries (int s)    LDAP_GCCATTR((noreturn));
 static void do_error   (FILE *fp, char *s);
 static void do_search  (LDAP *ld, FILE *fp, char *buf);
 static void do_read    (LDAP *ld, FILE *fp, char *dn);

diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c
index 24b627f02b97368fcee7e160529f8d6e7b6e4fd1..533dea8a728093b25cdb8c618584172fb4f20386 100644 (file)
--- a/clients/gopher/go500gw.c
+++ b/clients/gopher/go500gw.c
@@ -63,10 +63,10 @@ char                *templatefile = TEMPLATEFILE;
 char           *friendlyfile = FRIENDLYFILE;
 int            rdncount = GO500GW_RDNCOUNT;
 
-static void usage      ( char *name );
+static void usage      ( char *name ) LDAP_GCCATTR((noreturn));
 static int  set_socket (int port);
 static RETSIGTYPE wait4child(int sig);
-static void do_queries (int s);
+static void do_queries (int s)    LDAP_GCCATTR((noreturn));
 static char *pick_oc   ( char **oclist );
 static int  isnonleaf  ( LDAP *ld, char **oclist, char *dn );
 static void do_menu    (LDAP *ld, FILE *fp, char *dn);

diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index 678663805d2714196c757b66697e80a88ba053a7..b3b3f446e260946fb1ed1cf12d750828d367b41e 100644 (file)
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -178,7 +178,7 @@ static void add_to( char ***list, int *nlist, char **new );
 static void add_single_to( char ***list, char *new );
 static int  isgroup( LDAPMessage *e );
 static void add_error( Error **err, int *nerr, int code, char *addr, LDAPMessage *msg );
-static void unbind_and_exit( int rc );
+static void unbind_and_exit( int rc ) LDAP_GCCATTR((noreturn));
 static void send_group( Group *group, int ngroup );
 
 static int  connect_to_x500( void );
@@ -1829,7 +1829,3 @@ unbind_and_exit( int rc )
 
        exit( rc );
 }
-
-
-
-

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 729a6d1cd8db56dd81a644ca2da661c62c887a63..bd6a0cb64ac036850325c091b86de688790e4450 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -60,7 +60,7 @@ static LDAP   *ld;
 #define T_NEWSUPSTR            "newsuperior"
 
 
-static void usage LDAP_P(( const char *prog ));
+static void usage LDAP_P(( const char *prog )) LDAP_GCCATTR((noreturn));
 static int process_ldapmod_rec LDAP_P(( char *rbuf ));
 static int process_ldif_rec LDAP_P(( char *rbuf, int count ));
 static void addmodifyop LDAP_P(( LDAPMod ***pmodsp, int modop, char *attr,

diff --git a/clients/ud/ud.h b/clients/ud/ud.h
index 3dd04bbc372dc998e93785411eabcfba904792de..3f9e6087dc6051fffff54272efaf505ca717d693 100644 (file)
--- a/clients/ud/ud.h
+++ b/clients/ud/ud.h
@@ -234,7 +234,7 @@ void print_help     LDAP_P(( char *s ));
 #ifdef DEBUG
 #endif
 
-void do_commands       LDAP_P(( void ));
+void do_commands       LDAP_P(( void )) LDAP_GCCATTR((noreturn));
 void status    LDAP_P(( void ));
 void change_base       LDAP_P(( int type, char **base, char *s ));
 void initialize_client LDAP_P(( void ));
@@ -280,7 +280,7 @@ void ka_StringToKey LDAP_P(( char *str, char *cell, des_cblock *key ));
 /* in util.c: */
 void printbase LDAP_P(( char *lead, char *s ));
 void fetch_buffer      LDAP_P(( char *buffer, int length, FILE *where ));
-void fatal     LDAP_P(( char *s ));
+void fatal     LDAP_P(( char *s )) LDAP_GCCATTR((noreturn));
 int  isgroup   LDAP_P(( void ));
 void format    LDAP_P(( char *str, int width, int lead ));
 void format2   LDAP_P(( char *s, char *ft, char *t, int fi, int i, int w ));

diff --git a/include/ac/setproctitle.h b/include/ac/setproctitle.h
index 816b78b2e910ff39228809997f5b3d8c25ed33e2..5bf1d2f49634a3ac13a43816d58f5eadef73426f 100644 (file)
--- a/include/ac/setproctitle.h
+++ b/include/ac/setproctitle.h
@@ -19,7 +19,8 @@
 #      include <libutil.h>
 #else
        /* use lutil version */
-       LDAP_F(void) (setproctitle) LDAP_P((const char *fmt, ...));
+       LDAP_F(void) (setproctitle) LDAP_P((const char *fmt, ...)) \
+                                   LDAP_GCCATTR((format(printf, 1, 2)));
        LDAP_F(int) Argc;
        LDAP_F(char) **Argv;
 #endif

diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index 30ec675f14f0f114d87e85c657bf9be95f4124db..7e26591ceab2ff34c16fe90078d6d2a10c96806f 100644 (file)
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -30,7 +30,7 @@ ber_pvt_log_printf LDAP_P((
        int errlvl,
        int loglvl,
        const char *fmt,
-       ... ));
+       ... )) LDAP_GCCATTR((format(printf, 3, 4)));
 
 LDAP_END_DECL
 

diff --git a/include/ldap_cdefs.h b/include/ldap_cdefs.h
index c0088a0bca6b6b9a48cb9b60135d01dc59bdcfda..dc5722d82e38a6d34405e96875d0198e84f1ecb6 100644 (file)
--- a/include/ldap_cdefs.h
+++ b/include/ldap_cdefs.h
@@ -56,6 +56,13 @@
 #      define LDAP_F_EXPORT    extern
 #endif
 
+#if (__GNUC__) * 1000 + (__GNUC_MINOR__) >= 2006
+#      define LDAP_GCCATTR(attrs)      __attribute__(attrs)
+#else
+#      define LDAP_GCCATTR(attrs)
+#endif
+
+
 #endif /* _LDAP_CDEFS_H */
 
 /* purposely allow these to be redefined */

diff --git a/include/ldap_log.h b/include/ldap_log.h
index 9007711ba6fa7c46a0e643122dd94c2f5afe0e17..dfb2e7a9cdc78d171a87805eed297686644f8836 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -76,7 +76,7 @@ extern int    ldap_syslog_level;
 
 LDAP_F(void) lutil_debug LDAP_P((
        int debug, int level,
-       const char* fmt, ... ));
+       const char* fmt, ... )) LDAP_GCCATTR((format(printf, 3, 4)));
 
 LDAP_END_DECL
 

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index e9146db127075b985e0816da0e673d53345672a7..155e9162154ac15ccf6a36dc25ea86f045795988 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -299,7 +299,8 @@ void ldap_int_utils_init LDAP_P(( void ));
 /*
  * in print.c
  */
-int ldap_log_printf LDAP_P((LDAP *ld, int level, const char *fmt, ...));
+int ldap_log_printf LDAP_P((LDAP *ld, int level, const char *fmt, ...))
+                    LDAP_GCCATTR((format(printf, 3, 4)));
 
 /*
  * in cache.c

diff --git a/servers/ldapd/proto-ldapd.h b/servers/ldapd/proto-ldapd.h
index 61f575f31eb6ae0e59c1d4f4178bd1344021dc79..21bb8b4655331fea5c009355f1c2d46066cc1e35 100644 (file)
--- a/servers/ldapd/proto-ldapd.h
+++ b/servers/ldapd/proto-ldapd.h
@@ -86,7 +86,7 @@ int kerberos_check_mutual LDAP_P(( struct ds_bind_arg *res, u_long nonce ));
  * main.c
  */
 
-RETSIGTYPE log_and_exit LDAP_P(( int exitcode ));
+RETSIGTYPE log_and_exit LDAP_P(( int exitcode )) LDAP_GCCATTR((noreturn));
 
 /*
  * message.c

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index b4ffd971c01b7294690a43a39b1f4c791727f74e..3f92c707b647a677a7bdf6774c050181382e09a6 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -19,7 +19,7 @@
 static void            split(char *line, int splitchar, char **left, char **right);
 static void            acl_append(AccessControl **l, AccessControl *a);
 static void            access_append(Access **l, Access *a);
-static void            acl_usage(void);
+static void            acl_usage(void) LDAP_GCCATTR((noreturn));
 #ifdef LDAP_DEBUG
 static void            print_acl(AccessControl *a);
 static void            print_access(Access *b);

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 938e8bbd39c1147384619b45c093b9b8feebc61b..3f65bc41edac37afd10f8be36bbb898660216a76 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -19,8 +19,9 @@ static Avlnode                *object_classes = NULL;
 
 int    global_schemacheck = 1; /* schemacheck on is default */
 
-static void            oc_usage_old(void);
-static void            oc_usage(void);
+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[] = {
        "",

diff --git a/servers/slapd/shell-backends/shellutil.h b/servers/slapd/shell-backends/shellutil.h
index 0832432ff0ff1eb336fbed59115cb89ba5e31a23..451af0d3c8cf6c6487affcea9f8187807ff99577 100644 (file)
--- a/servers/slapd/shell-backends/shellutil.h
+++ b/servers/slapd/shell-backends/shellutil.h
@@ -75,7 +75,7 @@ struct ldentry {
 
 
 #ifdef LDAP_DEBUG
-void   debug_printf(const char *, ...);
+void   debug_printf(const char *, ...) LDAP_GCCATTR((format(printf, 1, 2)));
 #else /* LDAP_DEBUG */
 #define        debug_printf    (void) /* Ignore "arguments" */
 #endif /* LDAP_DEBUG */