src/oping.c: Allow shorter interval settings.

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index 227b72c..cfbe18a 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -75,7 +75,7 @@ static int     opt_addrfamily = PING_DEF_AF;
 static char   *opt_srcaddr    = NULL;
 static int     opt_count      = -1;
 
-void sigint_handler (int signal)
+static void sigint_handler (int signal)
 {
        /* Make compiler happy */
        signal = 0;
@@ -83,7 +83,7 @@ void sigint_handler (int signal)
        opt_count = 0;
 }
 
-ping_context_t *context_create (void)
+static ping_context_t *context_create (void)
 {
        ping_context_t *ret;
 
@@ -100,19 +100,19 @@ ping_context_t *context_create (void)
        return (ret);
 }
 
-void context_destroy (ping_context_t *context)
+static void context_destroy (ping_context_t *context)
 {
        free (context);
 }
 
-void usage_exit (const char *name)
+static void usage_exit (const char *name)
 {
        fprintf (stderr, "Usage: %s [-46] [-c count] [-i interval] host [host [host ...]]\n",
                        name);
        exit (1);
 }
 
-int read_options (int argc, char **argv)
+static int read_options (int argc, char **argv)
 {
        int optchar;
 
@@ -143,7 +143,10 @@ int read_options (int argc, char **argv)
                                {
                                        double new_interval;
                                        new_interval = atof (optarg);
-                                       if (new_interval >= 0.2)
+                                       if (new_interval < 0.001)
+                                               fprintf (stderr, "Ignoring invalid interval %g.\n",
+                                                               new_interval);
+                                       else
                                                opt_interval = new_interval;
                                }
                                break;
@@ -164,7 +167,7 @@ int read_options (int argc, char **argv)
        return (optind);
 }
 
-void print_host (pingobj_iter_t *iter)
+static void print_host (pingobj_iter_t *iter)
 {
        double          latency;
        unsigned int    sequence;
@@ -211,7 +214,7 @@ void print_host (pingobj_iter_t *iter)
        }
 }
 
-void time_normalize (struct timespec *ts)
+static void time_normalize (struct timespec *ts)
 {
        while (ts->tv_nsec < 0)
        {
@@ -232,7 +235,7 @@ void time_normalize (struct timespec *ts)
        }
 }
 
-void time_calc (struct timespec *ts_dest,
+static void time_calc (struct timespec *ts_dest,
                const struct timespec *ts_int,
                const struct timeval  *tv_begin,
                const struct timeval  *tv_end)
@@ -455,7 +458,7 @@ int main (int argc, char **argv)
                }
 
                ping_iterator_set_context (iter, NULL);
-               free (context);
+               context_destroy (context);
        }
 
        ping_destroy (ping);