From a42f287685af56239ca27d20aa9bd6c670a389fb Mon Sep 17 00:00:00 2001
From: Nicolas Favre-Felix <n.favrefelix@gmail.com>
Date: Tue, 28 Dec 2010 20:44:22 +0100
Subject: [PATCH] Name change.

---
 Makefile                  | 4 ++--
 README.markdown           | 2 +-
 server.c                  | 4 ++--
 server.h                  | 6 +++---
 dishy.c => webdis.c       | 4 ++--
 dishy.json => webdis.json | 0
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename dishy.c => webdis.c (96%)
 rename dishy.json => webdis.json (100%)

diff --git a/Makefile b/Makefile
index 2c9b055..760bf31 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-OUT=dishy
+OUT=webdis
 HIREDIS_OBJ=hiredis/hiredis.o hiredis/sds.o hiredis/net.o hiredis/async.o
 JANSSON_OBJ=jansson/src/dump.o jansson/src/error.o jansson/src/hashtable.o jansson/src/load.o jansson/src/strbuffer.o jansson/src/utf.o jansson/src/value.o jansson/src/variadic.o 
 FORMAT_OBJS=formats/json.o formats/raw.o
-OBJS=dishy.o conf.o $(FORMAT_OBJS) cmd.o server.o $(HIREDIS_OBJ) $(JANSSON_OBJ)
+OBJS=webdis.o conf.o $(FORMAT_OBJS) cmd.o server.o $(HIREDIS_OBJ) $(JANSSON_OBJ)
 CFLAGS=-O3 -Wall -Wextra -I. -Ijansson/src
 LDFLAGS=-levent
 
diff --git a/README.markdown b/README.markdown
index b7606ce..6820c8e 100644
--- a/README.markdown
+++ b/README.markdown
@@ -4,7 +4,7 @@ A very simple prototype providing an HTTP interface to Redis. It uses [hiredis](
 
 <pre>
 make clean all
-./dishy &
+./webdis &
 curl http://127.0.0.1:7379/SET/hello/world
 → {"SET":[true,"OK"]}
 curl http://127.0.0.1:7379/GET/hello
diff --git a/server.c b/server.c
index 1fcd1e6..f7d1a8d 100644
--- a/server.c
+++ b/server.c
@@ -22,7 +22,7 @@ disconnectCallback(const redisAsyncContext *c, int status) {
 	/* wait 10 msec and reconnect */
 	s->tv_reconnect.tv_sec = 0;
 	s->tv_reconnect.tv_usec = 100000;
-	dishy_connect(s);
+	webdis_connect(s);
 }
 
 static void
@@ -59,7 +59,7 @@ on_timer_reconnect(int fd, short event, void *ctx) {
 }
 
 void
-dishy_connect(struct server *s) {
+webdis_connect(struct server *s) {
 	/* schedule reconnect */
 	evtimer_set(&s->ev_reconnect, on_timer_reconnect, s);
 	event_base_set(s->base, &s->ev_reconnect);
diff --git a/server.h b/server.h
index f8b8162..ffd91b1 100644
--- a/server.h
+++ b/server.h
@@ -1,5 +1,5 @@
-#ifndef DISHY_H
-#define DISHY_H
+#ifndef SERVER_H
+#define SERVER_H
 
 #include <hiredis/async.h>
 #include <time.h>
@@ -17,7 +17,7 @@ struct server {
 };
 
 void
-dishy_connect(struct server *s);
+webdis_connect(struct server *s);
 
 #endif
 
diff --git a/dishy.c b/webdis.c
similarity index 96%
rename from dishy.c
rename to webdis.c
index c60f08e..edb28ed 100644
--- a/dishy.c
+++ b/webdis.c
@@ -58,7 +58,7 @@ main(int argc, char *argv[]) {
 	if(argc > 1) {
 		s->cfg = conf_read(argv[1]);
 	} else {
-		s->cfg = conf_read("dishy.json");
+		s->cfg = conf_read("webdis.json");
 	}
 
 	/* ignore sigpipe */
@@ -71,7 +71,7 @@ main(int argc, char *argv[]) {
 	evhttp_set_gencb(http, on_request, s);
 
 	/* attach hiredis to libevent base */
-	dishy_connect(s);
+	webdis_connect(s);
 
 	/* loop */
 	event_base_dispatch(s->base);
diff --git a/dishy.json b/webdis.json
similarity index 100%
rename from dishy.json
rename to webdis.json