d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add FBSDID, rename local variable time to not conflict with time()

Browse Source
This commit is contained in:
Philippe Charnier 2006-09-12 17:54:35 +00:00
parent 32494417a8
commit 9833aeada2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sbin/sconfig/sconfig.c
View File

@ -15,8 +15,11 @@
* all derivative works or modified versions.
*
* Cronyx Id: sconfig.c,v 1.4.2.2 2005/11/09 13:01:35 rik Exp $
* $FreeBSD$
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -39,9 +42,6 @@ char mask[64];
int adapter_type; /* 0-sigma, 1-tau, 2-taupci, 3-tau32 */
char chan_name[16];
extern char *optarg;
extern int optind;
static void
usage (void)
{
@ -257,7 +257,11 @@ print_modems (int fd, int need_header)
}
static void
#ifdef __linux__
print_ifconfig (int fd)
#else
print_ifconfig (int fd __unused)
#endif
{
char buf [64];
#ifdef __linux__
@ -508,14 +512,14 @@ format_e3_status (unsigned long status)
}
static char *
format_e3_cv (unsigned long cv, unsigned long baud, unsigned long time)
format_e3_cv (unsigned long cv, unsigned long baud, unsigned long atime)
{
static char buf[80];
if (!cv || !baud || !time)
if (!cv || !baud || !atime)
sprintf (buf, " - ");
else
sprintf (buf, "%10lu (%.1e)", cv, (double)cv/baud/time);
sprintf (buf, "%10lu (%.1e)", cv, (double)cv/baud/atime);
return buf;
}