summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-hashfn.c
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2015-07-28 12:11:12 -0400
committerJeff Darcy <jdarcy@redhat.com>2015-09-01 04:55:15 -0700
commit0773ca67fdb60a142207759fa6c07a69882ce59c (patch)
tree027101fce644fe17e58c78321b1632f38aaed166 /xlators/cluster/dht/src/dht-hashfn.c
parent038dfe57cf0c5944b0392332dbf5a00bb1208150 (diff)
all: reduce "inline" usage
There are three kinds of inline functions: plain inline, extern inline, and static inline. All three have been removed from .c files, except those in "contrib" which aren't our problem. Inlines in .h files, which are overwhelmingly "static inline" already, have generally been left alone. Over time we should be able to "lower" these into .c files, but that has to be done in a case-by-case fashion requiring more manual effort. This part was easy to do automatically without (as far as I can tell) any ill effect. In the process, several pieces of dead code were flagged by the compiler, and were removed. Change-Id: I56a5e614735c9e0a6ee420dab949eac22e25c155 BUG: 1245331 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/11769 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Dan Lambright <dlambrig@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com> Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-hashfn.c')
-rw-r--r--xlators/cluster/dht/src/dht-hashfn.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/xlators/cluster/dht/src/dht-hashfn.c b/xlators/cluster/dht/src/dht-hashfn.c
index 478d6cea2f5..66e3ede736b 100644
--- a/xlators/cluster/dht/src/dht-hashfn.c
+++ b/xlators/cluster/dht/src/dht-hashfn.c
@@ -39,7 +39,7 @@ dht_hash_compute_internal (int type, const char *name, uint32_t *hash_p)
}
-static inline
+static
gf_boolean_t
dht_munge_name (const char *original, char *modified, size_t len, regex_t *re)
{
@@ -72,13 +72,6 @@ dht_hash_compute (xlator_t *this, int type, const char *name, uint32_t *hash_p)
size_t len = 0;
gf_boolean_t munged = _gf_false;
- /*
- * It wouldn't be safe to use alloca in an inline function that doesn't
- * actually get inlined, and it wouldn't be efficient to do a real
- * allocation, so we use alloca here (if needed) and pass that to the
- * inline.
- */
-
if (priv->extra_regex_valid) {
len = strlen(name) + 1;
rsync_friendly_name = alloca(len);