#164 cap_lines free method

inc/log.h

@@ -50,12 +50,11 @@ void log_cap_lines_start(struct SList **log_cap_lines);
 
 void log_cap_lines_stop(struct SList **log_cap_lines);
 
+void log_cap_lines_free(struct SList **log_cap_lines);
+
 void log_cap_lines_playback(struct SList *log_cap_lines);
 
 void log_cap_lines_write(struct SList **log_cap_lines, const char *path);
 
-
-void log_cap_line_free(void *log_cap_line);
-
 #endif // LOG_H
 

src/ipc.c

@@ -119,7 +119,8 @@ void ipc_response_free(void *vresponse) {
 	cfg_free(response->cfg);
 	lid_free(response->lid);
 	slist_free_vals(&response->heads, head_free);
-	slist_free_vals(&response->log_cap_lines, log_cap_line_free);
+
+	log_cap_lines_free(&response->log_cap_lines);
 
 	free(response);
 }
@@ -132,7 +133,7 @@ void ipc_operation_free(struct IpcOperation *operation) {
 
 	log_cap_lines_stop(&operation->log_cap_lines);
 
-	slist_free_vals(&operation->log_cap_lines, log_cap_line_free);
+	log_cap_lines_free(&operation->log_cap_lines);
 
 	free(operation);
 }

src/layout.c

@@ -308,8 +308,7 @@ void apply(void) {
 		// TODO unique file passed to the user
 		log_cap_lines_stop(&log_cap_lines);
 		log_cap_lines_write(&log_cap_lines, "/tmp/wd.delta");
-
-		slist_free_vals(&log_cap_lines, log_cap_line_free);
+		log_cap_lines_free(&log_cap_lines);
 
 		// all changes except mode
 		for (i = heads_changing; i; i = i->nex) {

src/log.c

@@ -187,6 +187,20 @@ void log_suppress_stop(void) {
 	active.suppressing = false;
 }
 
+void log_cap_line_free(void *data) {
+	struct LogCapLine *line = data;
+
+	if (!line) {
+		return;
+	}
+
+	if (line->line) {
+		free(line->line);
+	}
+
+	free(line);
+}
+
 void log_cap_lines_playback(struct SList *lines) {
 	if (!lines)
 		return;
@@ -208,6 +222,10 @@ void log_cap_lines_stop(struct SList **lines) {
 	slist_remove_all(&log_cap_lines_active, NULL, lines);
 }
 
+void log_cap_lines_free(struct SList **lines) {
+	slist_free_vals(lines, log_cap_line_free);
+}
+
 void log_cap_lines_write(struct SList **lines, const char *path) {
 
 	// write empty to clear and validate
@@ -221,17 +239,3 @@ void log_cap_lines_write(struct SList **lines, const char *path) {
 	}
 }
 
-void log_cap_line_free(void *data) {
-	struct LogCapLine *line = data;
-
-	if (!line) {
-		return;
-	}
-
-	if (line->line) {
-		free(line->line);
-	}
-
-	free(line);
-}
-

src/marshalling.cpp

@@ -1069,7 +1069,7 @@ char *marshal_ipc_response(struct IpcOperation *operation) {
 	}
 
 	// clear marshalled messages
-	slist_free_vals(&operation->log_cap_lines, log_cap_line_free);
+	log_cap_lines_free(&operation->log_cap_lines);
 
 	return yaml;
 }

src/server.c

@@ -257,7 +257,7 @@ server(char *cfg_path) {
 	log_suppress_stop();
 	log_cap_lines_stop(&log_cap_lines);
 	log_cap_lines_playback(log_cap_lines);
-	slist_free_vals(&log_cap_lines, log_cap_line_free);
+	log_cap_lines_free(&log_cap_lines);
 
 	// discover the lid state immediately
 	lid_init();