GitList

@@ -39,6 +39,11 @@ func httpError(w http.ResponseWriter, err error) {
 	}
 }
 
+func writeJson(w http.ResponseWriter, b []byte) {
+	w.Header().Set("Content-Type", "application/json")
+	w.Write(b)
+}
+
 func getAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
 	config := &auth.AuthConfig{
 		Username: srv.runtime.authConfig.Username,
@@ -48,8 +53,7 @@ func getAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[strin
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -76,8 +80,7 @@ func postAuth(srv *Server, w http.ResponseWriter, r *http.Request, vars map[stri
 		if err != nil {
 			return err
 		}
-		w.Header().Set("Content-Type", "application/json")
-		w.Write(b)
+		writeJson(w, b)
 		return nil
 	}
 	w.WriteHeader(http.StatusNoContent)
@@ -90,8 +93,7 @@ func getVersion(srv *Server, w http.ResponseWriter, r *http.Request, vars map[st
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -137,8 +139,7 @@ func getImagesJson(srv *Server, w http.ResponseWriter, r *http.Request, vars map
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -155,8 +156,7 @@ func getInfo(srv *Server, w http.ResponseWriter, r *http.Request, vars map[strin
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -173,8 +173,7 @@ func getImagesHistory(srv *Server, w http.ResponseWriter, r *http.Request, vars
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -191,8 +190,7 @@ func getContainersChanges(srv *Server, w http.ResponseWriter, r *http.Request, v
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -215,8 +213,7 @@ func getContainersPs(srv *Server, w http.ResponseWriter, r *http.Request, vars m
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -261,8 +258,7 @@ func postCommit(srv *Server, w http.ResponseWriter, r *http.Request, vars map[st
 		return err
 	}
 	w.WriteHeader(http.StatusCreated)
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -310,8 +306,7 @@ func getImagesSearch(srv *Server, w http.ResponseWriter, r *http.Request, vars m
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -402,8 +397,7 @@ func postContainersCreate(srv *Server, w http.ResponseWriter, r *http.Request, v
 		return err
 	}
 	w.WriteHeader(http.StatusCreated)
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -501,8 +495,7 @@ func postContainersWait(srv *Server, w http.ResponseWriter, r *http.Request, var
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -547,8 +540,7 @@ func getContainersByName(srv *Server, w http.ResponseWriter, r *http.Request, va
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 
@@ -566,8 +558,7 @@ func getImagesByName(srv *Server, w http.ResponseWriter, r *http.Request, vars m
 	if err != nil {
 		return err
 	}
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(b)
+	writeJson(w, b)
 	return nil
 }
 

...	...	@@ -39,6 +39,11 @@ func httpError(w http.ResponseWriter, err error) {
39	39	}
40	40	}
41	41
	42	+func writeJson(w http.ResponseWriter, b []byte) {
	43	+ w.Header().Set("Content-Type", "application/json")
	44	+ w.Write(b)
	45	+}
	46	+
42	47	func getAuth(srv Server, w http.ResponseWriter, r http.Request, vars map[string]string) error {
43	48	config := &auth.AuthConfig{
44	49	Username: srv.runtime.authConfig.Username,
...	...	@@ -48,8 +53,7 @@ func getAuth(srv Server, w http.ResponseWriter, r http.Request, vars map[strin
48	48	if err != nil {
49	49	return err
50	50	}
51		- w.Header().Set("Content-Type", "application/json")
52		- w.Write(b)
	51	+ writeJson(w, b)
53	52	return nil
54	53	}
55	54
...	...	@@ -76,8 +80,7 @@ func postAuth(srv Server, w http.ResponseWriter, r http.Request, vars map[stri
76	76	if err != nil {
77	77	return err
78	78	}
79		- w.Header().Set("Content-Type", "application/json")
80		- w.Write(b)
	79	+ writeJson(w, b)
81	80	return nil
82	81	}
83	82	w.WriteHeader(http.StatusNoContent)
...	...	@@ -90,8 +93,7 @@ func getVersion(srv Server, w http.ResponseWriter, r http.Request, vars map[st
90	90	if err != nil {
91	91	return err
92	92	}
93		- w.Header().Set("Content-Type", "application/json")
94		- w.Write(b)
	93	+ writeJson(w, b)
95	94	return nil
96	95	}
97	96
...	...	@@ -137,8 +139,7 @@ func getImagesJson(srv Server, w http.ResponseWriter, r http.Request, vars map
137	137	if err != nil {
138	138	return err
139	139	}
140		- w.Header().Set("Content-Type", "application/json")
141		- w.Write(b)
	140	+ writeJson(w, b)
142	141	return nil
143	142	}
144	143
...	...	@@ -155,8 +156,7 @@ func getInfo(srv Server, w http.ResponseWriter, r http.Request, vars map[strin
155	155	if err != nil {
156	156	return err
157	157	}
158		- w.Header().Set("Content-Type", "application/json")
159		- w.Write(b)
	158	+ writeJson(w, b)
160	159	return nil
161	160	}
162	161
...	...	@@ -173,8 +173,7 @@ func getImagesHistory(srv Server, w http.ResponseWriter, r http.Request, vars
173	173	if err != nil {
174	174	return err
175	175	}
176		- w.Header().Set("Content-Type", "application/json")
177		- w.Write(b)
	176	+ writeJson(w, b)
178	177	return nil
179	178	}
180	179
...	...	@@ -191,8 +190,7 @@ func getContainersChanges(srv Server, w http.ResponseWriter, r http.Request, v
191	191	if err != nil {
192	192	return err
193	193	}
194		- w.Header().Set("Content-Type", "application/json")
195		- w.Write(b)
	194	+ writeJson(w, b)
196	195	return nil
197	196	}
198	197
...	...	@@ -215,8 +213,7 @@ func getContainersPs(srv Server, w http.ResponseWriter, r http.Request, vars m
215	215	if err != nil {
216	216	return err
217	217	}
218		- w.Header().Set("Content-Type", "application/json")
219		- w.Write(b)
	218	+ writeJson(w, b)
220	219	return nil
221	220	}
222	221
...	...	@@ -261,8 +258,7 @@ func postCommit(srv Server, w http.ResponseWriter, r http.Request, vars map[st
261	261	return err
262	262	}
263	263	w.WriteHeader(http.StatusCreated)
264		- w.Header().Set("Content-Type", "application/json")
265		- w.Write(b)
	264	+ writeJson(w, b)
266	265	return nil
267	266	}
268	267
...	...	@@ -310,8 +306,7 @@ func getImagesSearch(srv Server, w http.ResponseWriter, r http.Request, vars m
310	310	if err != nil {
311	311	return err
312	312	}
313		- w.Header().Set("Content-Type", "application/json")
314		- w.Write(b)
	313	+ writeJson(w, b)
315	314	return nil
316	315	}
317	316
...	...	@@ -402,8 +397,7 @@ func postContainersCreate(srv Server, w http.ResponseWriter, r http.Request, v
402	402	return err
403	403	}
404	404	w.WriteHeader(http.StatusCreated)
405		- w.Header().Set("Content-Type", "application/json")
406		- w.Write(b)
	405	+ writeJson(w, b)
407	406	return nil
408	407	}
409	408
...	...	@@ -501,8 +495,7 @@ func postContainersWait(srv Server, w http.ResponseWriter, r http.Request, var
501	501	if err != nil {
502	502	return err
503	503	}
504		- w.Header().Set("Content-Type", "application/json")
505		- w.Write(b)
	504	+ writeJson(w, b)
506	505	return nil
507	506	}
508	507
...	...	@@ -547,8 +540,7 @@ func getContainersByName(srv Server, w http.ResponseWriter, r http.Request, va
547	547	if err != nil {
548	548	return err
549	549	}
550		- w.Header().Set("Content-Type", "application/json")
551		- w.Write(b)
	550	+ writeJson(w, b)
552	551	return nil
553	552	}
554	553
...	...	@@ -566,8 +558,7 @@ func getImagesByName(srv Server, w http.ResponseWriter, r http.Request, vars m
566	566	if err != nil {
567	567	return err
568	568	}
569		- w.Header().Set("Content-Type", "application/json")
570		- w.Write(b)
	569	+ writeJson(w, b)
571	570	return nil
572	571	}
573	572

add writeJson