gssproxy/Reorder-functions.patch

From 6803191543fe0cea1f39c75e9f81bbe90ab8b053 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Wed, 6 Mar 2019 15:06:14 -0500
Subject: [PATCH] Reorder functions

Keep related functions closer together like before

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Robbie Harwood <rharwood@redhat.com>
Resolves: #242
(cherry picked from commit 6accc0afead574e11447447c949f2abcb1a34826)
---
 src/client/gpm_common.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/client/gpm_common.c b/src/client/gpm_common.c
index 95a39ab..808f350 100644
--- a/src/client/gpm_common.c
+++ b/src/client/gpm_common.c
@@ -140,16 +140,6 @@ static void gpm_close_socket(struct gpm_ctx *gpmctx)
     gpmctx->fd = -1;
 }
 
-static void gpm_epoll_close(struct gpm_ctx *gpmctx)
-{
-    if (gpmctx->epollfd < 0) {
-        return;
-    }
-
-    close(gpmctx->epollfd);
-    gpmctx->epollfd = -1;
-}
-
 static void gpm_timer_close(struct gpm_ctx *gpmctx)
 {
     if (gpmctx->timerfd < 0) {
@@ -160,13 +150,6 @@ static void gpm_timer_close(struct gpm_ctx *gpmctx)
     gpmctx->timerfd = -1;
 }
 
-static int gpm_release_sock(struct gpm_ctx *gpmctx)
-{
-    gpm_epoll_close(gpmctx);
-    gpm_timer_close(gpmctx);
-    return pthread_mutex_unlock(&gpmctx->lock);
-}
-
 static int gpm_timer_setup(struct gpm_ctx *gpmctx, int timeout_seconds)
 {
     int ret;
@@ -197,6 +180,16 @@ static int gpm_timer_setup(struct gpm_ctx *gpmctx, int timeout_seconds)
     return 0;
 }
 
+static void gpm_epoll_close(struct gpm_ctx *gpmctx)
+{
+    if (gpmctx->epollfd < 0) {
+        return;
+    }
+
+    close(gpmctx->epollfd);
+    gpmctx->epollfd = -1;
+}
+
 static int gpm_epoll_setup(struct gpm_ctx *gpmctx)
 {
     struct epoll_event ev;
@@ -224,6 +217,13 @@ static int gpm_epoll_setup(struct gpm_ctx *gpmctx)
     return ret;
 }
 
+static int gpm_release_sock(struct gpm_ctx *gpmctx)
+{
+    gpm_epoll_close(gpmctx);
+    gpm_timer_close(gpmctx);
+    return pthread_mutex_unlock(&gpmctx->lock);
+}
+
 static int gpm_grab_sock(struct gpm_ctx *gpmctx)
 {
     int ret;