socket-proxy: clean-up indenting

[elogind.git] / src / socket-proxy / socket-proxyd.c

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 05ea88ac69c831103dc1ec2962f0544dd87565a6..a449b0eec42ba9d28af64c85b4f7642d4f264f5b 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -37,6 +37,7 @@
 #include "socket-util.h"
 #include "util.h"
 #include "event-util.h"
+#include "build.h"
 
 #define BUFFER_SIZE 16384
 #define _cleanup_freeaddrinfo_ _cleanup_(freeaddrinfop)
@@ -109,11 +110,11 @@ static int remove_event_from_connection(struct connection *c, uint32_t events) {
         }
 
         if (c->events == 0) {
-            r = sd_event_source_set_enabled(c->w, SD_EVENT_OFF);
-            if (r < 0) {
-                    log_error("Error %d disabling source: %s", r, strerror(-r));
-                    return r;
-            }
+                r = sd_event_source_set_enabled(c->w, SD_EVENT_OFF);
+                if (r < 0) {
+                        log_error("Error %d disabling source: %s", r, strerror(-r));
+                        return r;
+                }
         }
 
         return 0;
@@ -154,11 +155,11 @@ static int send_buffer(struct connection *sender) {
 
                 /* If the buffer is full, disable events coming for recv. */
                 if (sender->buffer_filled_len == BUFFER_SIZE) {
-                    r = remove_event_from_connection(sender, EPOLLIN);
-                    if (r < 0) {
-                            log_error("Error %d disabling EPOLLIN for fd=%d: %s", r, sender->fd, strerror(-r));
-                            return r;
-                    }
+                        r = remove_event_from_connection(sender, EPOLLIN);
+                        if (r < 0) {
+                                log_error("Error %d disabling EPOLLIN for fd=%d: %s", r, sender->fd, strerror(-r));
+                                return r;
+                        }
                 }
 
                 /* Watch for when the recipient can be sent data again. */
@@ -217,8 +218,7 @@ static int transfer_data_cb(sd_event_source *s, int fd, uint32_t revents, void *
                                 if (errno != EWOULDBLOCK && errno != EAGAIN) {
                                         log_error("Error %d in recv from fd=%d: %m", errno, fd);
                                         return -errno;
-                                }
-                                else {
+                                } else {
                                         /* recv() is in a blocking state. */
                                         break;
                                 }
@@ -279,7 +279,7 @@ static int connected_to_server_cb(sd_event_source *s, int fd, uint32_t revents,
         }
         c_client_to_server->events = EPOLLIN;
 
-goto finish;
+        goto finish;
 
 fail:
         free_connection(c_client_to_server);
@@ -511,10 +511,6 @@ static int help(void) {
         return 0;
 }
 
-static void version(void) {
-        puts(PACKAGE_STRING " socket-proxyd");
-}
-
 static int parse_argv(int argc, char *argv[], struct proxy *p) {
 
         enum {
@@ -526,7 +522,7 @@ static int parse_argv(int argc, char *argv[], struct proxy *p) {
                 { "help",       no_argument, NULL, 'h'           },
                 { "version",    no_argument, NULL, ARG_VERSION   },
                 { "ignore-env", no_argument, NULL, ARG_IGNORE_ENV},
-                { NULL,         0,           NULL, 0             }
+                {}
         };
 
         int c;
@@ -539,23 +535,22 @@ static int parse_argv(int argc, char *argv[], struct proxy *p) {
                 switch (c) {
 
                 case 'h':
-                        help();
-                        return 0;
-
-                case '?':
-                        return -EINVAL;
+                        return help();
 
                 case ARG_VERSION:
-                        version();
+                        puts(PACKAGE_STRING);
+                        puts(SYSTEMD_FEATURES);
                         return 0;
 
                 case ARG_IGNORE_ENV:
                         p->ignore_env = true;
                         continue;
 
-                default:
-                        log_error("Unknown option code %c", c);
+                case '?':
                         return -EINVAL;
+
+                default:
+                        assert_not_reached("Unhandled option");
                 }
         }