RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libmisc/shell: Remove the need for -lm when linking from the ping command.

Browse Source 
Remove the use of sqrt and so the need to link to -lm.
Clean up some warnings.
This commit is contained in:
Chris Johns
2014-10-04 08:55:12 +10:00
parent 7db695311b
commit 56ed56a641
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cpukit/libmisc/shell/main_ping.c
View File

@@ -86,7 +86,9 @@ __FBSDID("$FreeBSD$");
#include <ctype.h> #include <ctype.h>
//#include <err.h> //#include <err.h>
#include <errno.h> #include <errno.h>
#if !defined(__rtems__)
#include <math.h> #include <math.h>
#endif
#include <netdb.h> #include <netdb.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@@ -333,7 +335,6 @@ static char *pr_ntime(n_time);
static void pr_icmph(struct icmp *); static void pr_icmph(struct icmp *);
static void pr_iph(struct ip *); static void pr_iph(struct ip *);
static void pr_retip(struct ip *); static void pr_retip(struct ip *);
static void status(int);
static void stopit(int); static void stopit(int);
static void tvsub(struct timeval *, struct timeval *); static void tvsub(struct timeval *, struct timeval *);
@@ -358,7 +359,7 @@ static void g_pr_pack(char *, int, struct sockaddr_in *, struct timeval *, rtems
#define usage() g_usage(globals) #define usage() g_usage(globals)
static void g_usage(rtems_shell_globals_t* globals) __dead2; static void g_usage(rtems_shell_globals_t* globals) __dead2;
void static void
rtems_shell_ping_exit (rtems_shell_globals_t* globals, int code) rtems_shell_ping_exit (rtems_shell_globals_t* globals, int code)
{ {
globals->exit_code = code; globals->exit_code = code;
@@ -1581,14 +1582,14 @@ tvsub(out, in)
* Print out statistics when SIGINFO is received. * Print out statistics when SIGINFO is received.
*/ */
#if !defined(__rtems__)
static void static void
status(sig) status(sig)
int sig __unused; int sig __unused;
{ {
#if !__rtems__
siginfo_p = 1; siginfo_p = 1;
#endif
} }
#endif
static void static void
g_check_status(globals) g_check_status(globals)
@@ -1638,10 +1639,16 @@ g_finish(globals)
if (nreceived && timing) { if (nreceived && timing) {
double n = nreceived + nrepeats; double n = nreceived + nrepeats;
double avg = tsum / n; double avg = tsum / n;
#if defined(__rtems__)
(void) printf(
"round-trip min/avg/max/stddev = %.3f/%.3f/%.3f ms\n",
tmin, avg, tmax);
#else
double vari = tsumsq / n - avg * avg; double vari = tsumsq / n - avg * avg;
(void)printf( (void)printf(
"round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n", "round-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms\n",
tmin, avg, tmax, sqrt(vari)); tmin, avg, tmax, sqrt(vari));
#endif
} }
if (nreceived) if (nreceived)
exit(0); exit(0);
@@ -1917,7 +1924,7 @@ g_fill(bp, patp, globals)
u_int ii, jj, kk; u_int ii, jj, kk;
for (cp = patp; *cp; cp++) { for (cp = patp; *cp; cp++) {
if (!isxdigit(*cp)) if (!isxdigit((int)*cp))
errx(&globals->exit_jmp, EX_USAGE, errx(&globals->exit_jmp, EX_USAGE,
"patterns must be specified as hex digits"); "patterns must be specified as hex digits");