Rename config.c to parsing.c + move cgit_parse_query from cgit.c to parsing.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

4 files changed, 29 insertions, 28 deletions

diff --git a/Makefile b/Makefileindex c71e39c..eab7926 100644--- a/Makefile+++ b/Makefile@@ -5,7 +5,7 @@ INSTALL_CSS = /var/www/htdocs/cgit.css CACHE_ROOT = /var/cache/cgit  EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto-OBJECTS = config.o html.o cache.o+OBJECTS = parsing.o html.o cache.o  CFLAGS += -Wall @@ -17,7 +17,8 @@ install: all 	rm -rf $(CACHE_ROOT)/*  cgit: cgit.c cgit.h git.h $(OBJECTS)-	$(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit $(OBJECTS) $(EXTLIBS)+	$(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \+		$(OBJECTS) $(EXTLIBS)  $(OBJECTS): cgit.h git.h 
diff --git a/Makefile b/Makefile
index c71e39c..eab7926 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ INSTALL_CSS = /var/www/htdocs/cgit.css
 CACHE_ROOT = /var/cache/cgit
 
 EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
-OBJECTS = config.o html.o cache.o
+OBJECTS = parsing.o html.o cache.o
 
 CFLAGS += -Wall
 
@@ -17,7 +17,8 @@ install: all
 	rm -rf $(CACHE_ROOT)/*
 
 cgit: cgit.c cgit.h git.h $(OBJECTS)
-	$(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
+	$(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
+		$(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git.h
 
diff --git a/cgit.c b/cgit.cindex dc91125..5567859 100644--- a/cgit.c+++ b/cgit.c@@ -53,32 +53,6 @@ char *cgit_query_sha1   = NULL;  struct cacheitem cacheitem; -int cgit_parse_query(char *txt, configfn fn)-{-	char *t, *value = NULL, c;--	if (!txt)-		return 0;--	t = txt = xstrdup(txt);- -	while((c=*t) != '\0') {-		if (c=='=') {-			*t = '\0';-			value = t+1;-		} else if (c=='&') {-			*t = '\0';-			(*fn)(txt, value);-			txt = t+1;-			value = NULL;-		}-		t++;-	}-	if (t!=txt)-		(*fn)(txt, value);-	return 0;-}- void cgit_global_config_cb(const char *name, const char *value) { 	if (!strcmp(name, "root"))
diff --git a/cgit.c b/cgit.c
index dc91125..5567859 100644
--- a/cgit.c
+++ b/cgit.c
@@ -53,32 +53,6 @@ char *cgit_query_sha1   = NULL;
 
 struct cacheitem cacheitem;
 
-int cgit_parse_query(char *txt, configfn fn)
-{
-	char *t, *value = NULL, c;
-
-	if (!txt)
-		return 0;
-
-	t = txt = xstrdup(txt);
- 
-	while((c=*t) != '\0') {
-		if (c=='=') {
-			*t = '\0';
-			value = t+1;
-		} else if (c=='&') {
-			*t = '\0';
-			(*fn)(txt, value);
-			txt = t+1;
-			value = NULL;
-		}
-		t++;
-	}
-	if (t!=txt)
-		(*fn)(txt, value);
-	return 0;
-}
-
 void cgit_global_config_cb(const char *name, const char *value)
 {
 	if (!strcmp(name, "root"))
diff --git a/cgit.h b/cgit.hindex 7e4bfef..6c0aa3b 100644--- a/cgit.h+++ b/cgit.h@@ -56,6 +56,7 @@ extern void html_link_close(void);   extern int cgit_read_config(const char *filename, configfn fn);+extern int cgit_parse_query(char *txt, configfn fn);  extern void cache_prepare(struct cacheitem *item); extern int cache_lock(struct cacheitem *item);
diff --git a/cgit.h b/cgit.h
index 7e4bfef..6c0aa3b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -56,6 +56,7 @@ extern void html_link_close(void);
 
 
 extern int cgit_read_config(const char *filename, configfn fn);
+extern int cgit_parse_query(char *txt, configfn fn);
 
 extern void cache_prepare(struct cacheitem *item);
 extern int cache_lock(struct cacheitem *item);
diff --git a/config.c b/parsing.cindex 871edf2..98b3243 100644--- a/config.c+++ b/parsing.c@@ -79,3 +79,28 @@ int cgit_read_config(const char *filename, configfn fn) 	return ret; } +int cgit_parse_query(char *txt, configfn fn)+{+	char *t, *value = NULL, c;++	if (!txt)+		return 0;++	t = txt = xstrdup(txt);+ +	while((c=*t) != '\0') {+		if (c=='=') {+			*t = '\0';+			value = t+1;+		} else if (c=='&') {+			*t = '\0';+			(*fn)(txt, value);+			txt = t+1;+			value = NULL;+		}+		t++;+	}+	if (t!=txt)+		(*fn)(txt, value);+	return 0;+}
diff --git a/config.c b/parsing.c
index 871edf2..98b3243 100644
--- a/config.c
+++ b/parsing.c
@@ -79,3 +79,28 @@ int cgit_read_config(const char *filename, configfn fn)
 	return ret;
 }
 
+int cgit_parse_query(char *txt, configfn fn)
+{
+	char *t, *value = NULL, c;
+
+	if (!txt)
+		return 0;
+
+	t = txt = xstrdup(txt);
+ 
+	while((c=*t) != '\0') {
+		if (c=='=') {
+			*t = '\0';
+			value = t+1;
+		} else if (c=='&') {
+			*t = '\0';
+			(*fn)(txt, value);
+			txt = t+1;
+			value = NULL;
+		}
+		t++;
+	}
+	if (t!=txt)
+		(*fn)(txt, value);
+	return 0;
+}