From 0be8e038d9bf90be94f3e3a7d6ea5bee88da9ecb Mon Sep 17 00:00:00 2001
From: Jeff Darcy <jdarcy@fb.com>
Date: Thu, 29 Jun 2017 06:50:56 -0700
Subject: multiple: fix struct/typedef inconsistencies

The most common pattern, both in our code and elsewhere, is this:

   struct _xyz {
      ...
   };
   typedef struct _xyz xyz_t;

These exceptions - especially call_frame/call_stack - have been slowing
down code navigation for years.  By converging on a single pattern,
navigating from xyz_t in code to the actual definition of struct _xyz
(i.e. without having to visit the typedef first) might even be
automatable.

Change-Id: I0e5dd1f51f98e000173c62ef4ddc5b21d9ec44ed
Signed-off-by: Jeff Darcy <jdarcy@fb.com>
Reviewed-on: https://review.gluster.org/17650
Smoke: Gluster Build System <jenkins@build.gluster.org>
Tested-by: Jeff Darcy <jeff@pl.atyp.us>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
---
 libglusterfs/src/client_t.h  |  2 +-
 libglusterfs/src/gf-dirent.h | 10 +++++-----
 libglusterfs/src/refcount.h  |  4 ++--
 libglusterfs/src/stack.h     | 12 ++++++------
 libglusterfs/src/xlator.h    |  8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'libglusterfs')

diff --git a/libglusterfs/src/client_t.h b/libglusterfs/src/client_t.h
index b4546f36bea..7666f0132b6 100644
--- a/libglusterfs/src/client_t.h
+++ b/libglusterfs/src/client_t.h
@@ -20,7 +20,7 @@ struct client_ctx {
         void     *ctx_value;
 };
 
-typedef struct _client_t {
+typedef struct _client {
         struct {
                 /* e.g. protocol/server stashes its ctx here */
                 gf_lock_t            lock;
diff --git a/libglusterfs/src/gf-dirent.h b/libglusterfs/src/gf-dirent.h
index caa09c1728e..fa323396e92 100644
--- a/libglusterfs/src/gf-dirent.h
+++ b/libglusterfs/src/gf-dirent.h
@@ -27,20 +27,20 @@ uint64_t
 gf_dirent_orig_offset (xlator_t *this, uint64_t offset);
 
 
-struct _dir_entry_t {
-        struct _dir_entry_t *next;
+struct _dir_entry {
+        struct _dir_entry   *next;
 	char                *name;
 	char                *link;
 	struct iatt          buf;
 };
 
 
-struct _gf_dirent_t {
+struct _gf_dirent {
 	union {
 		struct list_head             list;
 		struct {
-			struct _gf_dirent_t *next;
-			struct _gf_dirent_t *prev;
+			struct _gf_dirent   *next;
+			struct _gf_dirent   *prev;
 		};
 	};
 	uint64_t                             d_ino;
diff --git a/libglusterfs/src/refcount.h b/libglusterfs/src/refcount.h
index 4ae37fecbfe..25f44258e42 100644
--- a/libglusterfs/src/refcount.h
+++ b/libglusterfs/src/refcount.h
@@ -26,7 +26,7 @@
 
 typedef void (*gf_ref_release_t)(void *data);
 
-struct _gf_ref_t {
+struct _gf_ref {
 #ifdef REFCOUNT_NEEDS_LOCK
         gf_lock_t          lk;      /* lock for atomically adjust cnt */
 #endif
@@ -35,7 +35,7 @@ struct _gf_ref_t {
         gf_ref_release_t   release; /* cleanup when cnt == 0 */
         void              *data;    /* parameter passed to release() */
 };
-typedef struct _gf_ref_t gf_ref_t;
+typedef struct _gf_ref gf_ref_t;
 
 
 /* _gf_ref_get -- increase the refcount
diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h
index 51698d16f55..20fbdfabff5 100644
--- a/libglusterfs/src/stack.h
+++ b/libglusterfs/src/stack.h
@@ -16,10 +16,10 @@
 #ifndef _STACK_H
 #define _STACK_H
 
-struct _call_stack_t;
-typedef struct _call_stack_t call_stack_t;
-struct _call_frame_t;
-typedef struct _call_frame_t call_frame_t;
+struct _call_stack;
+typedef struct _call_stack call_stack_t;
+struct _call_frame;
+typedef struct _call_frame call_frame_t;
 struct call_pool;
 typedef struct call_pool call_pool_t;
 
@@ -61,7 +61,7 @@ struct call_pool {
         struct mem_pool             *stack_mem_pool;
 };
 
-struct _call_frame_t {
+struct _call_frame {
         call_stack_t *root;        /* stack root */
         call_frame_t *parent;      /* previous BP */
         struct list_head frames;
@@ -84,7 +84,7 @@ struct _call_frame_t {
 
 #define SMALL_GROUP_COUNT 128
 
-struct _call_stack_t {
+struct _call_stack {
         union {
                 struct list_head      all_frames;
                 struct {
diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h
index 894785e7985..06e7241bb8e 100644
--- a/libglusterfs/src/xlator.h
+++ b/libglusterfs/src/xlator.h
@@ -43,10 +43,10 @@
 
 struct _xlator;
 typedef struct _xlator xlator_t;
-struct _dir_entry_t;
-typedef struct _dir_entry_t dir_entry_t;
-struct _gf_dirent_t;
-typedef struct _gf_dirent_t gf_dirent_t;
+struct _dir_entry;
+typedef struct _dir_entry dir_entry_t;
+struct _gf_dirent;
+typedef struct _gf_dirent gf_dirent_t;
 struct _loc;
 typedef struct _loc loc_t;
 
-- 
cgit