upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 01:30:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Take a shot at fixing up a whole stack of style and other embarresing

Browse source 
unforced errors that Bruce identified.  I have not yet addressed all of
his concerns.
This commit is contained in:
Peter Wemm 2002-08-31 03:33:32 +00:00
parent ea9b09fef2
commit 31cdffc6d8
8 changed files with 68 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/alpha/alpha/machdep.c
View file

@ -203,32 +203,28 @@ vm_offset_t phys_avail[10];
static int
sysctl_hw_physmem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = alpha_ptob(physmem);
error = sysctl_handle_long(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_physmem, "LU", "");
static int
sysctl_hw_usermem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = alpha_ptob(physmem - cnt.v_wire_count);
error = sysctl_handle_long(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_usermem, "LU", "");
SYSCTL_INT(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, "");
SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, "");
/* must be 2 less so 0 0 can signal end of chunks */
#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2)

27
sys/amd64/amd64/machdep.c
View file

@ -158,41 +158,38 @@ static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code);
static int
sysctl_hw_physmem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem);
error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_physmem, "LU", "");
static int
sysctl_hw_usermem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem - cnt.v_wire_count);
error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_usermem, "LU", "");
static int
sysctl_hw_availpages(SYSCTL_HANDLER_ARGS)
{
int error = sysctl_handle_int(oidp, 0,
i386_btop(avail_end - avail_start), req);
return (error);
u_long val;
val = i386_btop(avail_end - avail_start);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD,
0, 0, sysctl_hw_availpages, "I", "");
SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_availpages, "LU", "");
long Maxmem = 0;

27
sys/i386/i386/machdep.c
View file

@ -158,41 +158,38 @@ static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code);
static int
sysctl_hw_physmem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem);
error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_physmem, "LU", "");
static int
sysctl_hw_usermem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem - cnt.v_wire_count);
error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_usermem, "LU", "");
static int
sysctl_hw_availpages(SYSCTL_HANDLER_ARGS)
{
int error = sysctl_handle_int(oidp, 0,
i386_btop(avail_end - avail_start), req);
return (error);
u_long val;
val = i386_btop(avail_end - avail_start);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD,
0, 0, sysctl_hw_availpages, "I", "");
SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_availpages, "LU", "");
long Maxmem = 0;

18
sys/ia64/ia64/machdep.c
View file

@ -154,32 +154,28 @@ vm_offset_t phys_avail[100];
static int
sysctl_hw_physmem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ia64_ptob(physmem);
error = sysctl_handle_long(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_physmem, "LU", "");
static int
sysctl_hw_usermem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ia64_ptob(physmem - cnt.v_wire_count);
error = sysctl_handle_long(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_usermem, "LU", "");
SYSCTL_LONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, "");
SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, "");
/* must be 2 less so 0 0 can signal end of chunks */
#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2)

30
sys/pc98/i386/machdep.c
View file

@ -175,44 +175,38 @@ static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code);
static int
sysctl_hw_physmem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem);
int error = sysctl_handle_int(oidp, &val, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_physmem, "LU", "");
static int
sysctl_hw_usermem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem - cnt.v_wire_count);
int error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_usermem, "LU", "");
static int
sysctl_hw_availpages(SYSCTL_HANDLER_ARGS)
{
int error;
long val;
u_long val;
val = i386_btop(avail_end - avail_start);
error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_LONG|CTLFLAG_RD,
0, 0, sysctl_hw_availpages, "L", "");
SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_availpages, "LU", "");
long Maxmem = 0;
#ifdef PC98
@ -1535,7 +1529,7 @@ physmap_done:
if (atop(physmap[physmap_idx + 1]) != Maxmem &&
(boothowto & RB_VERBOSE))
printf("Physical memory use set to %uK\n", Maxmem * 4);
printf("Physical memory use set to %ldK\n", Maxmem * 4);
/*
* If Maxmem has been increased beyond what the system has detected,

30
sys/pc98/pc98/machdep.c
View file

@ -175,44 +175,38 @@ static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code);
static int
sysctl_hw_physmem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem);
int error = sysctl_handle_int(oidp, &val, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_physmem, "LU", "");
static int
sysctl_hw_usermem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem - cnt.v_wire_count);
int error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_usermem, "LU", "");
static int
sysctl_hw_availpages(SYSCTL_HANDLER_ARGS)
{
int error;
long val;
u_long val;
val = i386_btop(avail_end - avail_start);
error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_LONG|CTLFLAG_RD,
0, 0, sysctl_hw_availpages, "L", "");
SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_availpages, "LU", "");
long Maxmem = 0;
#ifdef PC98
@ -1535,7 +1529,7 @@ physmap_done:
if (atop(physmap[physmap_idx + 1]) != Maxmem &&
(boothowto & RB_VERBOSE))
printf("Physical memory use set to %uK\n", Maxmem * 4);
printf("Physical memory use set to %ldK\n", Maxmem * 4);
/*
* If Maxmem has been increased beyond what the system has detected,

8
sys/powerpc/aim/machdep.c
View file

@ -153,15 +153,13 @@ void osendsig(sig_t, int, sigset_t *, u_long);
static int
sysctl_hw_physmem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem);
error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_physmem, "LU", "");
long Maxmem = 0;

8
sys/powerpc/powerpc/machdep.c
View file

@ -153,15 +153,13 @@ void osendsig(sig_t, int, sigset_t *, u_long);
static int
sysctl_hw_physmem(SYSCTL_HANDLER_ARGS)
{
int error;
unsigned long val;
u_long val;
val = ctob(physmem);
error = sysctl_handle_int(oidp, &val, 0, req);
return (error);
return (sysctl_handle_long(oidp, &val, 0, req));
}
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD,
SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD,
0, 0, sysctl_hw_physmem, "LU", "");
long Maxmem = 0;