From: Daniel Richard G <skunk@iSKUNK.ORG>
Date: Sat, 4 Aug 2012 11:16:20 +0000 (+0200)
Subject: Avoid per-element initializers.
X-Git-Tag: v0.1.5~12^2~6
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=b28495993eef26688c998650d0e2bf944082704e;p=dss.git

Avoid per-element initializers.

Per-element struct initializers are not supported in ANSI C. This
construct doesn't gain much in terms of readability, and breaks
compatibility with older/stricter compilers.
---

diff --git a/dss.c b/dss.c
index 7c8b54f..3a14e51 100644
--- a/dss.c
+++ b/dss.c
@@ -913,13 +913,12 @@ static int parse_config_file(int override)
 		goto out;
 	}
 	if (config_file_exists) {
-		struct cmdline_parser_params params = {
-			.override = override,
-			.initialize = 0,
-			.check_required = 1,
-			.check_ambiguity = 0,
-			.print_errors = 1
-		};
+		struct cmdline_parser_params params;
+		params.override = override;
+		params.initialize = 0;
+		params.check_required = 1;
+		params.check_ambiguity = 0;
+		params.print_errors = 1;
 		if (override) { /* invalidate all rsync options */
 			int i;
 
@@ -1024,12 +1023,14 @@ static int use_rsync_locally(char *logname)
 
 static int rename_resume_snap(int64_t creation_time)
 {
-	struct snapshot_list sl = {.num_snapshots = 0};
+	struct snapshot_list sl;
 	struct snapshot *s = NULL;
 	char *new_name = incomplete_name(creation_time);
 	int ret;
 	const char *why;
 
+	sl.num_snapshots = 0;
+
 	ret = 0;
 	if (conf.no_resume_given)
 		goto out;
@@ -1395,13 +1396,13 @@ static int setup_signal_handling(void)
 int main(int argc, char **argv)
 {
 	int ret;
-	struct cmdline_parser_params params = {
-		.override = 0,
-		.initialize = 1,
-		.check_required = 0,
-		.check_ambiguity = 0,
-		.print_errors = 1
-	};
+	struct cmdline_parser_params params;
+
+	params.override = 0;
+	params.initialize = 1;
+	params.check_required = 0;
+	params.check_ambiguity = 0;
+	params.print_errors = 1;
 
 	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
 	ret = parse_config_file(0);
@@ -1412,13 +1413,12 @@ int main(int argc, char **argv)
 		 * Parse the command line options again, but this time check
 		 * that all required options are given.
 		 */
-		params = (struct cmdline_parser_params) {
-			.override = 1,
-			.initialize = 1,
-			.check_required = 1,
-			.check_ambiguity = 1,
-			.print_errors = 1
-		};
+		struct cmdline_parser_params params;
+		params.override = 1;
+		params.initialize = 1;
+		params.check_required = 1;
+		params.check_ambiguity = 1;
+		params.print_errors = 1;
 		cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
 	}
 	if (conf.daemon_given)
diff --git a/snap.c b/snap.c
index 41dc329..d1caf56 100644
--- a/snap.c
+++ b/snap.c
@@ -155,11 +155,10 @@ static int compare_snapshots(const void *a, const void *b)
 void get_snapshot_list(struct snapshot_list *sl, int unit_interval,
 		int num_intervals)
 {
-	struct add_snapshot_data asd = {
-		.unit_interval = unit_interval,
-		.num_intervals = num_intervals,
-		.sl = sl
-	};
+	struct add_snapshot_data asd;
+	asd.unit_interval = unit_interval;
+	asd.num_intervals = num_intervals;
+	asd.sl = sl;
 	sl->now = get_current_time();
 	sl->num_snapshots = 0;
 	sl->array_size = 0;