[bug-inetutils] moving some ping_set_* functions to ping_common - 4

[Rakesh Pandit]

Hello,

 This one fixs concern in patch1.

-- 
rakesh

--- inetutils.org/ChangeLog     2008-08-27 22:56:07.000000000 +0530
+++ inetutils/ChangeLog 2008-08-27 23:46:59.000000000 +0530
@@ -1,3 +1,13 @@
+2008-08-28  Rakesh Pandit <address@hidden>
+
+       * ping.h, libping.h, ping_common.h, ping_common.c
+       (ping_set_count, ping_set_sockopt, ping_set_interval):
+       Moved functions from ping to ping_common.
+
+       * ping6.c (main):
+       Used ping_set_count, ping_set_sockopt, ping_set_interval
+       in place of directly modifying struct p.
+       
 2008-08-28  Rakesh Pandit <address@hidden>

        * ping/ping6.c, ping/libping.c, ping_common.c
--- inetutils.org/ping/ping.h   2008-08-27 22:56:07.000000000 +0530
+++ inetutils/ping/ping.h       2008-08-27 23:45:19.000000000 +0530
@@ -42,9 +42,6 @@
 PING *ping_init (int type, int ident);
 void ping_reset (PING * p);
 void ping_set_type (PING * p, int type);
-void ping_set_count (PING * ping, size_t count);
-void ping_set_sockopt (PING * ping, int opt, void *val, int valsize);
-void ping_set_interval (PING * ping, size_t interval);
 void ping_set_packetsize (PING * ping, size_t size);
 int ping_set_dest (PING * ping, char *host);
 int ping_set_pattern (PING * p, int len, u_char * pat);
--- inetutils.org/ping/libping.c        2008-08-27 22:56:07.000000000 +0530
+++ inetutils/ping/libping.c    2008-08-27 23:33:17.000000000 +0530
@@ -280,24 +280,6 @@
 }

 void
-ping_set_count (PING * ping, size_t count)
-{
-  ping->ping_count = count;
-}
-
-void
-ping_set_sockopt (PING * ping, int opt, void *val, int valsize)
-{
-  setsockopt (ping->ping_fd, SOL_SOCKET, opt, (char *) &val, valsize);
-}
-
-void
-ping_set_interval (PING * ping, size_t interval)
-{
-  ping->ping_interval = interval;
-}
-
-void
 ping_set_packetsize (PING * ping, size_t size)
 {
   ping->ping_datalen = size;
--- inetutils.org/ping/ping_common.h    2008-08-27 22:56:07.000000000 +0530
+++ inetutils/ping/ping_common.h        2008-08-27 23:29:00.000000000 +0530
@@ -91,3 +91,6 @@

 int _ping_setbuf (PING * p, bool is_ping6);
 int ping_set_data (PING *p, void *data, size_t off, size_t len, bool is_ping6);
+void ping_set_count (PING * ping, size_t count);
+void ping_set_sockopt (PING * ping, int opt, void *val, int valsize);
+void ping_set_interval (PING * ping, size_t interval);
--- inetutils.org/ping/ping_common.c    2008-08-27 22:56:07.000000000 +0530
+++ inetutils/ping/ping_common.c        2008-08-27 23:30:24.000000000 +0530
@@ -176,3 +176,21 @@

   return 0;
 }
+
+void
+ping_set_count (PING * ping, size_t count)
+{
+  ping->ping_count = count;
+}
+
+void
+ping_set_sockopt (PING * ping, int opt, void *val, int valsize)
+{
+  setsockopt (ping->ping_fd, SOL_SOCKET, opt, (char *) &val, valsize);
+}
+
+void
+ping_set_interval (PING * ping, size_t interval)
+{
+  ping->ping_interval = interval;
+}
--- inetutils.org/ping/ping6.c  2008-08-27 22:56:07.000000000 +0530
+++ inetutils/ping/ping6.c      2008-08-27 23:32:14.000000000 +0530
@@ -191,14 +191,13 @@
   argv += index;

   if (count != 0)
-    ping->ping_count = count;
+    ping_set_count (ping, count);

   if (socket_type != 0)
-    setsockopt (ping->ping_fd, SOL_SOCKET, socket_type, &one, sizeof (one));
+    ping_set_sockopt (ping, socket_type, &one, sizeof (one));

   if (options & OPT_INTERVAL)
-    ping->ping_interval = interval;
-
+    ping_set_interval (ping, interval);

   init_data_buffer (patptr, pattern_len);