~ubuntu-branches/ubuntu/precise/nbd/precise-updates

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
diff --git a/nbd-server.c b/nbd-server.c
index afb82de..4f2b1f2 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -899,6 +899,7 @@ GArray* parse_cfile(gchar* f, bool have_global, GError** e) {
 			g_assert(p[j].ptype==PARAM_INT||p[j].ptype==PARAM_STRING||p[j].ptype==PARAM_BOOL||p[j].ptype==PARAM_INT64);
 			switch(p[j].ptype) {
 				case PARAM_INT:
+				case PARAM_INT64:
 					ival = g_key_file_get_integer(cfile,
 								groups[i],
 								p[j].paramname,
@@ -907,15 +908,6 @@ GArray* parse_cfile(gchar* f, bool have_global, GError** e) {
 						*((gint*)p[j].target) = ival;
 					}
 					break;
-				case PARAM_INT64:
-					i64val = g_key_file_get_int64(cfile,
-								groups[i],
-								p[j].paramname,
-								&err);
-					if(!err) {
-						*((gint64*)p[j].target) = i64val;
-					}
-					break;
 				case PARAM_STRING:
 					sval = g_key_file_get_string(cfile,
 								groups[i],