From: Mike Brady <4265913+mikebrady@users.noreply.github.com>
Date: Sun, 24 Jan 2021 21:32:57 +0000 (+0000)
Subject: Clean up with clang-format
X-Git-Tag: 4.0-dev~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c9e13a026a4ab81acfcb551aeae0941e08b236;p=thirdparty%2Fshairport-sync.git

Clean up with clang-format
---

diff --git a/common.c b/common.c
index 8520c714..6e0f12ab 100644
--- a/common.c
+++ b/common.c
@@ -834,7 +834,7 @@ void command_set_volume(double volume) {
           _exit(EXIT_FAILURE); /* only if execv fails */
         }
       }
-    _exit(EXIT_SUCCESS);
+      _exit(EXIT_SUCCESS);
     } else {
       if (config.cmd_blocking) { /* pid!=0 means parent process and if blocking is true, wait for
                                     process to finish */
diff --git a/dacp.c b/dacp.c
index effbe5ec..0230ac1c 100644
--- a/dacp.c
+++ b/dacp.c
@@ -446,11 +446,11 @@ void set_dacp_server_information(rtsp_conn_info *conn) {
   if (dacp_server.active_remote_id)
     free(dacp_server.active_remote_id);
   if (conn->dacp_active_remote)
-		dacp_server.active_remote_id =
-				strdup(conn->dacp_active_remote); // even if the dacp_id remains the same,
-																					// the active remote will change.
+    dacp_server.active_remote_id =
+        strdup(conn->dacp_active_remote); // even if the dacp_id remains the same,
+                                          // the active remote will change.
   else
-  	dacp_server.active_remote_id = NULL;
+    dacp_server.active_remote_id = NULL;
 
   debug(3, "set_dacp_server_information set active-remote id to %s.", dacp_server.active_remote_id);
   pthread_cond_signal(&dacp_server_information_cv);
diff --git a/rtsp.c b/rtsp.c
index f3524ae2..2661ccec 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -1652,40 +1652,41 @@ void *metadata_mqtt_thread_function(__attribute__((unused)) void *ignore) {
 #endif
 
 void metadata_init(void) {
-	int ret;
-	if (config.metadata_enabled) {
- 		// create the metadata pipe, if necessary
-		size_t pl = strlen(config.metadata_pipename) + 1;
-		char *path = malloc(pl + 1);
-		snprintf(path, pl + 1, "%s", config.metadata_pipename);
-		mode_t oldumask = umask(000);
-		if (mkfifo(path, 0666) && errno != EEXIST)
-			die("Could not create metadata pipe \"%s\".", path);
-		umask(oldumask);
-		debug(1, "metadata pipe name is \"%s\".", path);
-
-		// try to open it
-		fd = try_to_open_pipe_for_writing(path);
-		// we check that it's not a "real" error. From the "man 2 open" page:
-		// "ENXIO  O_NONBLOCK | O_WRONLY is set, the named file is a FIFO, and no process has the FIFO
-		// open for reading." Which is okay.
-		if ((fd == -1) && (errno != ENXIO)) {
-			char errorstring[1024];
-			strerror_r(errno, (char *)errorstring, sizeof(errorstring));
-			debug(1, "metadata_hub_thread_function -- error %d (\"%s\") opening pipe: \"%s\".", errno,
-						(char *)errorstring, path);
-			warn("can not open metadata pipe -- error %d (\"%s\") opening pipe: \"%s\".", errno,
-					 (char *)errorstring, path);
-		}
-		free(path);
-		int ret;
-		ret = pthread_create(&metadata_thread, NULL, metadata_thread_function, NULL);
-		if (ret)
-			debug(1, "Failed to create metadata thread!");
-
-		ret = pthread_create(&metadata_multicast_thread, NULL, metadata_multicast_thread_function, NULL);
-		if (ret)
-			debug(1, "Failed to create metadata multicast thread!");
+  int ret;
+  if (config.metadata_enabled) {
+    // create the metadata pipe, if necessary
+    size_t pl = strlen(config.metadata_pipename) + 1;
+    char *path = malloc(pl + 1);
+    snprintf(path, pl + 1, "%s", config.metadata_pipename);
+    mode_t oldumask = umask(000);
+    if (mkfifo(path, 0666) && errno != EEXIST)
+      die("Could not create metadata pipe \"%s\".", path);
+    umask(oldumask);
+    debug(1, "metadata pipe name is \"%s\".", path);
+
+    // try to open it
+    fd = try_to_open_pipe_for_writing(path);
+    // we check that it's not a "real" error. From the "man 2 open" page:
+    // "ENXIO  O_NONBLOCK | O_WRONLY is set, the named file is a FIFO, and no process has the FIFO
+    // open for reading." Which is okay.
+    if ((fd == -1) && (errno != ENXIO)) {
+      char errorstring[1024];
+      strerror_r(errno, (char *)errorstring, sizeof(errorstring));
+      debug(1, "metadata_hub_thread_function -- error %d (\"%s\") opening pipe: \"%s\".", errno,
+            (char *)errorstring, path);
+      warn("can not open metadata pipe -- error %d (\"%s\") opening pipe: \"%s\".", errno,
+           (char *)errorstring, path);
+    }
+    free(path);
+    int ret;
+    ret = pthread_create(&metadata_thread, NULL, metadata_thread_function, NULL);
+    if (ret)
+      debug(1, "Failed to create metadata thread!");
+
+    ret =
+        pthread_create(&metadata_multicast_thread, NULL, metadata_multicast_thread_function, NULL);
+    if (ret)
+      debug(1, "Failed to create metadata multicast thread!");
   }
 #ifdef CONFIG_METADATA_HUB
   ret = pthread_create(&metadata_hub_thread, NULL, metadata_hub_thread_function, NULL);
@@ -1715,19 +1716,19 @@ void metadata_stop(void) {
     pthread_join(metadata_hub_thread, NULL);
     // debug(2, "metadata stop hub done.");
 #endif
-		if (config.metadata_enabled) {
-			// debug(2, "metadata stop multicast thread.");
-			if (metadata_multicast_thread) {
-				pthread_cancel(metadata_multicast_thread);
-				pthread_join(metadata_multicast_thread, NULL);
-				// debug(2, "metadata stop multicast done.");
-			}
-			if (metadata_thread) {
-				// debug(2, "metadata stop metadata_thread thread.");
-				pthread_cancel(metadata_thread);
-				pthread_join(metadata_thread, NULL);
-				// debug(2, "metadata_stop finished successfully.");
-			}
+    if (config.metadata_enabled) {
+      // debug(2, "metadata stop multicast thread.");
+      if (metadata_multicast_thread) {
+        pthread_cancel(metadata_multicast_thread);
+        pthread_join(metadata_multicast_thread, NULL);
+        // debug(2, "metadata stop multicast done.");
+      }
+      if (metadata_thread) {
+        // debug(2, "metadata stop metadata_thread thread.");
+        pthread_cancel(metadata_thread);
+        pthread_join(metadata_thread, NULL);
+        // debug(2, "metadata_stop finished successfully.");
+      }
     }
   }
 }
@@ -1799,8 +1800,9 @@ int send_metadata(uint32_t type, uint32_t code, char *data, uint32_t length, rts
                   int block) {
   int rc;
   if (config.metadata_enabled) {
-  	rc = send_metadata_to_queue(&metadata_queue, type, code, data, length, carrier, block);
-  	rc = send_metadata_to_queue(&metadata_multicast_queue, type, code, data, length, carrier, block);
+    rc = send_metadata_to_queue(&metadata_queue, type, code, data, length, carrier, block);
+    rc =
+        send_metadata_to_queue(&metadata_multicast_queue, type, code, data, length, carrier, block);
   }
 
 #ifdef CONFIG_METADATA_HUB