Make status report uniform

Author: stevegrubb

audisp/plugins/statsd/audisp-statsd.c

@@ -54,7 +54,7 @@ struct audit_report
 {
 	unsigned int backlog;
 	unsigned int lost;
-	unsigned int free_space;
+	long long unsigned int free_space;
 	unsigned int plugin_current_depth;
 	unsigned int plugin_max_depth;
 	unsigned int events_total_count;
@@ -243,7 +243,7 @@ static void get_auditd_status(void)
 		while (fgets(buf, sizeof(buf), f)) {
 			if (memcmp(buf, "Logging", 7) == 0) {
 				sscanf(buf,
-				       "Logging partition free space %u",
+				       "Logging partition free space = %llu",
 				       &r.free_space);
 			} else if (memcmp(buf, "current plugin", 14) == 0) {
 				sscanf(buf,
@@ -276,7 +276,7 @@ static void send_statsd(void)
 	// incremented (events) are counters.
 	len = snprintf(message, sizeof(message),
 	  "kernel.lost:%u|g\nkernel.backlog:%u|g\n"
-	  "auditd.free_space:%u|g\nauditd.plugin_current_depth:%u|g\nauditd.plugin_max_depth:%u|g\n"
+	  "auditd.free_space:%llu|g\nauditd.plugin_current_depth:%u|g\nauditd.plugin_max_depth:%u|g\n"
 	  "events.total_count:%u|c\nevents.total_failed:%u|c\n"
 	  "events.avc_count:%u|c\nevents.fanotify_count:%u|c\n"
 	  "events.logins_success:%u|c\nevents.logins_failed:%u|c\n"

src/auditd-event.c

@@ -119,12 +119,12 @@ void write_logging_state(FILE *f)
 					fs_space_left ? "yes" : "no");
 		rc = fstatfs(log_fd, &buf);
 		if (rc == 0) {
-			fprintf(f, "Logging partition free space %llu MB\n",
+			fprintf(f, "Logging partition free space = %llu MB\n",
 				(long long unsigned)
 				(buf.f_bavail * buf.f_bsize)/MEGABYTE);
-			fprintf(f, "space_left setting %lu MB\n",
+			fprintf(f, "space_left setting = %lu MB\n",
 				config->space_left);
-			fprintf(f, "admin_space_left setting %lu MB\n",
+			fprintf(f, "admin_space_left setting = %lu MB\n",
 				config->admin_space_left);
 		}
 		fprintf(f, "logging suspended = %s\n",