[svn] Get rid of a gcc warning about strict-aliasing violation.

diff --git a/src/ChangeLog b/src/ChangeLog
index 76f88a1235d76e2ca826d0fad9253029cb2a501c..fe141555f68384258f698bad6eb51d46278379e4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-09  Mauro Tortonesi  <mauro@ferrara.linux.it>
+
+       * init.c (cmd_spec_prefer_family): Small fix to get rid of a gcc
+       warning about strict-aliasing violation.
+
 2007-01-09  Steven M. Schweda  <sms@antinode.org>
 
        * ftp-basic.c (ftp_syst): Fixed segfault if response text is missing.

diff --git a/src/init.c b/src/init.c
index 32e9ea4fdaa00360225f07a37ec733b274343cbc..35f9503acd81b2bed9750459d980af7104b6f52b 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -1135,10 +1135,11 @@ cmd_spec_prefer_family (const char *com, const char *val, void *place_ignored)
     { "IPv6", prefer_ipv6 },
     { "none", prefer_none },
   };
-  int ok = decode_string (val, choices, countof (choices),
-                         (int *) &opt.prefer_family);
+  int prefer_family = prefer_ipv4;
+  int ok = decode_string (val, choices, countof (choices), &prefer_family);
   if (!ok)
     fprintf (stderr, _("%s: %s: Invalid value `%s'.\n"), exec_name, com, val);
+  opt.prefer_family = prefer_family;
   return ok;
 }