From a12192f5ff33298eb7082cc3f6e2de17957e7d26 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Mon, 29 Jun 2015 12:07:18 +0200
Subject: [PATCH] Geo: command function names converted to lowercase, as
 elsewhere.

In Redis MULTIWORDCOMMANDNAME are mapped to functions where the command
name is all lowercase: multiwordcommandnameCommand().
---
 src/geo.c   | 18 +++++++++---------
 src/geo.h   |  6 ------
 src/redis.c | 12 ++++++------
 src/redis.h | 12 ++++++------
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/geo.c b/src/geo.c
index 18b0efac1..2869550ad 100644
--- a/src/geo.c
+++ b/src/geo.c
@@ -349,7 +349,7 @@ static int sort_gp_desc(const void *a, const void *b) {
  * ==================================================================== */
 
 /* GEOADD key long lat name [long2 lat2 name2 ... longN latN nameN] */
-void geoAddCommand(redisClient *c) {
+void geoaddCommand(redisClient *c) {
     /* Check arguments number for sanity. */
     if ((c->argc - 2) % 3 != 0) {
         /* Need an odd number of arguments if we got this far... */
@@ -405,7 +405,7 @@ void geoAddCommand(redisClient *c) {
 /* GEORADIUS key x y radius unit [WITHDIST] [WITHHASH] [WITHCOORD] [ASC|DESC]
  *                               [COUNT count]
  * GEORADIUSBYMEMBER key member radius unit ... options ... */
-static void geoRadiusGeneric(redisClient *c, int type) {
+static void georadiusGeneric(redisClient *c, int type) {
     robj *key = c->argv[1];
 
     /* Look up the requested zset */
@@ -555,17 +555,17 @@ static void geoRadiusGeneric(redisClient *c, int type) {
 }
 
 /* GEORADIUS wrapper function. */
-void geoRadiusCommand(redisClient *c) {
-    geoRadiusGeneric(c, RADIUS_COORDS);
+void georadiusCommand(redisClient *c) {
+    georadiusGeneric(c, RADIUS_COORDS);
 }
 
 /* GEORADIUSBYMEMBER wrapper function. */
-void geoRadiusByMemberCommand(redisClient *c) {
-    geoRadiusGeneric(c, RADIUS_MEMBER);
+void georadiusByMemberCommand(redisClient *c) {
+    georadiusGeneric(c, RADIUS_MEMBER);
 }
 
 /* GEODECODE long lat */
-void geoDecodeCommand(redisClient *c) {
+void geodecodeCommand(redisClient *c) {
     GeoHashBits geohash;
     if (getLongLongFromObjectOrReply(c, c->argv[1], (long long *)&geohash.bits,
                                      NULL) != REDIS_OK)
@@ -598,7 +598,7 @@ void geoDecodeCommand(redisClient *c) {
 }
 
 /* GEOENCODE long lat [radius unit] */
-void geoEncodeCommand(redisClient *c) {
+void geoencodeCommand(redisClient *c) {
     double radius_meters = 0;
     if (c->argc == 5) {
         if ((radius_meters = extractDistanceOrReply(c, c->argv + 3, NULL)) < 0)
@@ -659,7 +659,7 @@ void geoEncodeCommand(redisClient *c) {
  *
  * Returns an array with an 11 characters geohash representation of the
  * position of the specified elements. */
-void geoHashCommand(redisClient *c) {
+void geohashCommand(redisClient *c) {
     char *geoalphabet= "0123456789bcdefghjkmnpqrstuvwxyz";
     int j;
 
diff --git a/src/geo.h b/src/geo.h
index 4f5c5e6fe..cf4e42c90 100644
--- a/src/geo.h
+++ b/src/geo.h
@@ -3,12 +3,6 @@
 
 #include "redis.h"
 
-void geoEncodeCommand(redisClient *c);
-void geoDecodeCommand(redisClient *c);
-void geoRadiusByMemberCommand(redisClient *c);
-void geoRadiusCommand(redisClient *c);
-void geoAddCommand(redisClient *c);
-
 /* Structures used inside geo.c in order to represent points and array of
  * points on the earth. */
 typedef struct geoPoint {
diff --git a/src/redis.c b/src/redis.c
index 38430b82c..e6707d5f2 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -282,12 +282,12 @@ struct redisCommand redisCommandTable[] = {
     {"bitpos",bitposCommand,-3,"r",0,NULL,1,1,1,0,0},
     {"wait",waitCommand,3,"rs",0,NULL,0,0,0,0,0},
     {"command",commandCommand,0,"rlt",0,NULL,0,0,0,0,0},
-    {"geoadd",geoAddCommand,-5,"wm",0,NULL,1,1,1,0,0},
-    {"georadius",geoRadiusCommand,-6,"r",0,NULL,1,1,1,0,0},
-    {"georadiusbymember",geoRadiusByMemberCommand,-5,"r",0,NULL,1,1,1,0,0},
-    {"geoencode",geoEncodeCommand,-3,"r",0,NULL,0,0,0,0,0},
-    {"geodecode",geoDecodeCommand,2,"r",0,NULL,0,0,0,0,0},
-    {"geohash",geoHashCommand,-2,"r",0,NULL,0,0,0,0,0},
+    {"geoadd",geoaddCommand,-5,"wm",0,NULL,1,1,1,0,0},
+    {"georadius",georadiusCommand,-6,"r",0,NULL,1,1,1,0,0},
+    {"georadiusbymember",georadiusByMemberCommand,-5,"r",0,NULL,1,1,1,0,0},
+    {"geoencode",geoencodeCommand,-3,"r",0,NULL,0,0,0,0,0},
+    {"geodecode",geodecodeCommand,2,"r",0,NULL,0,0,0,0,0},
+    {"geohash",geohashCommand,-2,"r",0,NULL,0,0,0,0,0},
     {"geopos",geoposCommand,-2,"r",0,NULL,0,0,0,0,0},
     {"pfselftest",pfselftestCommand,1,"r",0,NULL,0,0,0,0,0},
     {"pfadd",pfaddCommand,-2,"wmF",0,NULL,1,1,1,0,0},
diff --git a/src/redis.h b/src/redis.h
index 8eca36d07..70b301a59 100644
--- a/src/redis.h
+++ b/src/redis.h
@@ -1558,12 +1558,12 @@ void bitcountCommand(redisClient *c);
 void bitposCommand(redisClient *c);
 void replconfCommand(redisClient *c);
 void waitCommand(redisClient *c);
-void geoEncodeCommand(redisClient *c);
-void geoDecodeCommand(redisClient *c);
-void geoRadiusByMemberCommand(redisClient *c);
-void geoRadiusCommand(redisClient *c);
-void geoAddCommand(redisClient *c);
-void geoHashCommand(redisClient *c);
+void geoencodeCommand(redisClient *c);
+void geodecodeCommand(redisClient *c);
+void georadiusByMemberCommand(redisClient *c);
+void georadiusCommand(redisClient *c);
+void geoaddCommand(redisClient *c);
+void geohashCommand(redisClient *c);
 void geoposCommand(redisClient *c);
 void pfselftestCommand(redisClient *c);
 void pfaddCommand(redisClient *c);