From 29cfe643cbcf7826375a3d52ff1865706a35bc38 Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amarts@redhat.com>
Date: Fri, 28 Jun 2019 22:51:37 +0530
Subject: libglusterfs: remove dependency of rpc

Goal: 'libglusterfs' files shouldn't have any dependency outside of
      the tree, specially the header files, shouldn't have '#include'
      from outside the tree.

Fixes:
* Had to introduce libglusterd so, methods and structures required
  for only mgmt/glusterd, and cli/ are separated from 'libglusterfs/'
* Remove rpc/xdr/gen from build, which was used mainly so
  dependency for libglusterfs could be properly satisfied.
* Move rpcsvc_auth_data to client_t.h, so all dependencies could
  be handled.

Updates: bz#1636297
Change-Id: I0e80243a5a3f4615e6fac6e1b947ad08a9363fce
Signed-off-by: Amar Tumballi <amarts@redhat.com>
---
 libglusterfs/src/common-utils.c | 68 -----------------------------------------
 1 file changed, 68 deletions(-)

(limited to 'libglusterfs/src/common-utils.c')

diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index df30507e3ae..360bc222c7e 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -45,13 +45,11 @@
 #include "glusterfs/stack.h"
 #include "glusterfs/lkowner.h"
 #include "glusterfs/syscall.h"
-#include "cli1-xdr.h"
 #include "glusterfs/globals.h"
 #define XXH_INLINE_ALL
 #include "xxhash.h"
 #include <ifaddrs.h>
 #include "glusterfs/libglusterfs-messages.h"
-#include "protocol-common.h"
 #ifdef __FreeBSD__
 #include <pthread_np.h>
 #undef BIT_SET
@@ -2984,16 +2982,6 @@ out:
     return result;
 }
 
-int
-get_vol_type(int type, int dist_count, int brick_count)
-{
-    if ((type != GF_CLUSTER_TYPE_TIER) && (type > 0) &&
-        (dist_count < brick_count))
-        type = type + GF_CLUSTER_TYPE_MAX - 1;
-
-    return type;
-}
-
 int
 validate_brick_name(char *brick)
 {
@@ -5253,62 +5241,6 @@ glusterfs_compute_sha256(const unsigned char *content, size_t size,
     return 0;
 }
 
-char *
-get_struct_variable(int mem_num, gf_gsync_status_t *sts_val)
-{
-    switch (mem_num) {
-        case 0:
-            return (sts_val->node);
-        case 1:
-            return (sts_val->master);
-        case 2:
-            return (sts_val->brick);
-        case 3:
-            return (sts_val->slave_user);
-        case 4:
-            return (sts_val->slave);
-        case 5:
-            return (sts_val->slave_node);
-        case 6:
-            return (sts_val->worker_status);
-        case 7:
-            return (sts_val->crawl_status);
-        case 8:
-            return (sts_val->last_synced);
-        case 9:
-            return (sts_val->entry);
-        case 10:
-            return (sts_val->data);
-        case 11:
-            return (sts_val->meta);
-        case 12:
-            return (sts_val->failures);
-        case 13:
-            return (sts_val->checkpoint_time);
-        case 14:
-            return (sts_val->checkpoint_completed);
-        case 15:
-            return (sts_val->checkpoint_completion_time);
-        case 16:
-            return (sts_val->brick_host_uuid);
-        case 17:
-            return (sts_val->last_synced_utc);
-        case 18:
-            return (sts_val->checkpoint_time_utc);
-        case 19:
-            return (sts_val->checkpoint_completion_time_utc);
-        case 20:
-            return (sts_val->slavekey);
-        case 21:
-            return (sts_val->session_slave);
-        default:
-            goto out;
-    }
-
-out:
-    return NULL;
-}
-
 /* * Safe wrapper function for strncpy.
  * This wrapper makes sure that when there is no null byte among the first n in
  * source srting for strncpy function call, the string placed in dest will be
-- 
cgit