Code hygiene fixes

Fixes if 32 bit size and a couple misc adjustments

Author: stevegrubb

audisp/plugins/remote/audisp-remote.c

@@ -747,7 +747,8 @@ static int send_token(int s, gss_buffer_t tok)
 	unsigned char lenbuf[4];
 	unsigned int len;
 
-	if (tok->length > 0xffffffffUL)
+	if (sizeof(tok->length) > sizeof(uint32_t) &&
+	    tok->length > 0xffffffffUL)
 		return -1;
 
 	len = tok->length;

auplugin/auplugin.h

@@ -95,7 +95,7 @@ int auplugin_setvbuf_r(auplugin_fgets_state_t *st, void *buf, size_t buff_size,
 
 /* auplugin family of functions prototypes */
 int auplugin_init(int inbound_fd, unsigned queue_size, int q_flags,
-		  const char *path);
+		  const char *path) __wur;
 void auplugin_stop(void);
 void auplugin_event_loop(auplugin_callback_ptr callback);
 int auplugin_event_feed(auparse_callback_ptr callback,

common/common.h

@@ -45,6 +45,15 @@
 #ifndef __has_attribute
 # define __has_attribute(x) 0
 #endif
+#ifndef __attribute_const__
+# define __attribute_const__
+#endif
+#ifndef __attribute_pure__
+# define __attribute_pure__
+#endif
+#ifndef __nonnull
+# define __nonnull(params)
+#endif
 
 /* Wrapper macros for optional atomics
  * Note: ATOMIC_INT and ATOMIC_UNSIGNED are defined in config.h */
@@ -71,7 +80,7 @@ AUDIT_HIDDEN_START
 
 char *audit_strsplit_r(char *s, char **savedpp);
 char *audit_strsplit(char *s);
-int audit_is_last_record(int type);
+int audit_is_last_record(int type) __attribute_const__;
 
 extern const char *SINGLE;
 extern const char *HALT;

src/auditd-event.h

@@ -52,6 +52,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);
 struct auditd_event *create_event(const char *msg, ack_func_type ack_func,
 			void *ack_data, uint32_t sequence_id);
 

src/auditd-listen.c

@@ -262,7 +262,8 @@ static int send_token(int s, gss_buffer_t tok)
 	unsigned char lenbuf[4];
 	unsigned int len;
 
-	if (tok->length > 0xffffffffUL)
+	if (sizeof(tok->length) > sizeof(uint32_t) &&
+	    tok->length > 0xffffffffUL)
 		return -1;
 	len = tok->length;
 	lenbuf[0] = (len >> 24) & 0xff;
@@ -553,7 +554,6 @@ static void client_ack(void *ack_data, const unsigned char *header,
 		ar_write(io->io.fd, msg, strlen(msg));
 }
 
-extern void distribute_event(struct auditd_event *e);
 static void client_message (struct ev_tcp *io, unsigned int length,
 	unsigned char *header)
 {