Add function attributes in various places

Author: stevegrubb

audisp/audispd-llist.h

@@ -28,6 +28,7 @@
 #include "config.h"
 #include <sys/types.h>
 #include "audispd-pconfig.h"
+#include "gcc-attributes.h"
 
 /* This is the node of the linked list. message & item are the only elements
  * at this time. Any data elements that are per item goes here. */
@@ -44,18 +45,34 @@ typedef struct {
   unsigned int cnt;	// How many items in this list
 } conf_llist;
 
-void plist_create(conf_llist *l);
-static inline void plist_first(conf_llist *l) { l->cur = l->head; }
-static inline unsigned int plist_count(conf_llist *l) { return l->cnt; }
-unsigned int plist_count_active(const conf_llist *l);
-void plist_last(conf_llist *l);
-lnode *plist_next(conf_llist *l);
-static inline lnode *plist_get_cur(conf_llist *l) { return l->cur; }
-int plist_append(conf_llist *l, plugin_conf_t *p);
-void plist_clear(conf_llist* l);
-void plist_mark_all_unchecked(conf_llist* l);
-lnode *plist_find_unchecked(conf_llist* l);
-lnode *plist_find_name(conf_llist* l, const char *name);
+void plist_create(conf_llist *l) __nonnull ((1));
+static inline void plist_first(conf_llist *l) __nonnull ((1));
+static inline unsigned int plist_count(conf_llist *l)
+	__attribute_pure__ __nonnull ((1));
+unsigned int plist_count_active(const conf_llist *l) __nonnull ((1));
+void plist_last(conf_llist *l) __nonnull ((1));
+lnode *plist_next(conf_llist *l) __nonnull ((1));
+static inline lnode *plist_get_cur(conf_llist *l) __nonnull ((1));
+int plist_append(conf_llist *l, plugin_conf_t *p) __nonnull ((1));
+void plist_clear(conf_llist* l) __nonnull ((1));
+void plist_mark_all_unchecked(conf_llist* l) __nonnull ((1));
+lnode *plist_find_unchecked(conf_llist* l) __nonnull ((1));
+lnode *plist_find_name(conf_llist* l, const char *name) __nonnull ((1));
+
+static inline void plist_first(conf_llist *l)
+{
+	l->cur = l->head;
+}
+
+static inline unsigned int plist_count(conf_llist *l)
+{
+	return l->cnt;
+}
+
+static inline lnode *plist_get_cur(conf_llist *l)
+{
+	return l->cur;
+}
 
 #endif
 

audisp/audispd-pconfig.h

@@ -26,6 +26,7 @@
 
 #include <sys/types.h>
 #include "libaudit.h"
+#include "gcc-attributes.h"
 
 typedef enum { A_NO, A_YES } active_t;
 typedef enum { S_ALWAYS, S_BUILTIN } service_t;
@@ -47,8 +48,9 @@ typedef struct plugin_conf
 	unsigned restart_cnt;	/* Number of times its crashed */
 } plugin_conf_t;
 
-void clear_pconfig(plugin_conf_t *config);
-int  load_pconfig(plugin_conf_t *config, int dirfd, char *file);
+void clear_pconfig(plugin_conf_t *config) __nonnull ((1));
+int  load_pconfig(plugin_conf_t *config, int dirfd, char *file)
+	__nonnull ((1, 3)) __wur;
 void free_pconfig(plugin_conf_t *config);
 
 #endif

gcc-attributes.h

@@ -43,6 +43,18 @@
 # define __attr_dealloc_free
 #endif
 
+#ifndef __attribute_const__
+# define __attribute_const__
+#endif
+
+#ifndef __attribute_pure__
+# define __attribute_pure__
+#endif
+
+#ifndef __nonnull
+# define __nonnull(params)
+#endif
+
 #ifndef __wur
 # define __wur
 #endif

src/auditd-config.h

@@ -24,6 +24,7 @@
 #define AUDITD_CONFIG_H
 
 #include "libaudit.h"
+#include "gcc-attributes.h"
 #include <grp.h>
 #define CONFIG_FILE "/etc/audit/auditd.conf"
 #define MEGABYTE 1048576UL
@@ -33,7 +34,8 @@
 
 typedef enum { D_FOREGROUND, D_BACKGROUND } daemon_t;
 typedef enum { LF_RAW, LF_NOLOG, LF_ENRICHED } logging_formats;
-typedef enum { FT_NONE, FT_INCREMENTAL, FT_INCREMENTAL_ASYNC, FT_DATA, FT_SYNC } flush_technique;
+typedef enum { FT_NONE, FT_INCREMENTAL, FT_INCREMENTAL_ASYNC, FT_DATA,
+	FT_SYNC } flush_technique;
 typedef enum { FA_IGNORE, FA_SYSLOG, FA_ROTATE, FA_EMAIL, FA_EXEC, FA_SUSPEND,
 		FA_SINGLE, FA_HALT } failure_action_t;
 typedef enum { SZ_IGNORE, SZ_SYSLOG, SZ_EXEC, SZ_SUSPEND, SZ_ROTATE,
@@ -102,20 +104,21 @@ struct daemon_conf
 };
 
 void set_allow_links(int allow);
-int set_config_dir(const char *val);
+int set_config_dir(const char *val) __nonnull ((1));
 
-int load_config(struct daemon_conf *config, log_test_t lt);
-void clear_config(struct daemon_conf *config);
-const char *audit_lookup_format(int fmt);
-int create_log_file(const char *val);
-int resolve_node(struct daemon_conf *config);
-void setup_percentages(struct daemon_conf *config, int fd);
+int load_config(struct daemon_conf *config, log_test_t lt)
+	__nonnull ((1)) __wur;
+void clear_config(struct daemon_conf *config) __nonnull ((1));
+const char *audit_lookup_format(int fmt) __attribute_const__;
+int create_log_file(const char *val) __nonnull ((1));
+int resolve_node(struct daemon_conf *config) __nonnull ((1));
+void setup_percentages(struct daemon_conf *config, int fd) __nonnull ((1));
 
 void init_config_manager(void);
 #ifdef AUDITD_EVENT_H
 int start_config_manager(struct auditd_event *e);
 #endif
-void free_config(struct daemon_conf *config);
+void free_config(struct daemon_conf *config) __nonnull ((1));
 
 const char *failure_action_to_str(unsigned int action);
 

src/auditd-event.h

@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include "libaudit.h"
+#include "gcc-attributes.h"
 
 typedef void (*ack_func_type)(void *ack_data, const unsigned char *header,
 			      const char *msg);
@@ -52,7 +53,7 @@ void cleanup_event(struct auditd_event *e);
 void format_event(struct auditd_event *e);
 void enqueue_event(struct auditd_event *e);
 void handle_event(struct auditd_event *e);
-void distribute_event(struct auditd_event *e);
+void distribute_event(struct auditd_event *e) __nonnull ((1));
 struct auditd_event *create_event(const char *msg, ack_func_type ack_func,
 			void *ack_data, uint32_t sequence_id);