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

- Remove the UNUSED_ARG macro and use __unused in argument lists

Browse Source 
Reviewed by:	dim
MFC after:	3 days
This commit is contained in:
Gabor Kovesdan 2012-06-08 19:21:49 +00:00
parent 7ac1b61aac
commit 89b7a5879e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=236764
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr.bin/sort/coll.c
View File

@ -792,7 +792,8 @@ cmpsuffix(unsigned char si1, unsigned char si2)
* Implements numeric sort for -n and -h.
*/
static int
numcoll_impl(struct key_value *kv1, struct key_value *kv2, size_t offset, bool use_suffix)
numcoll_impl(struct key_value *kv1, struct key_value *kv2,
size_t offset __unused, bool use_suffix)
{
struct bwstring *s1, *s2;
wchar_t sfrac1[MAX_NUM_SIZE + 1], sfrac2[MAX_NUM_SIZE + 1];
@ -810,8 +811,6 @@ numcoll_impl(struct key_value *kv1, struct key_value *kv2, size_t offset, bool u
cmp_res = 0;
key1_read = key2_read = false;
UNUSED_ARG(offset);
if (debug_sort) {
bwsprintf(stdout, s1, "; k1=<", ">");
bwsprintf(stdout, s2, ", k2=<", ">");
@ -968,14 +967,13 @@ hnumcoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
* Implements random sort (-R).
*/
static int
randomcoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
randomcoll(struct key_value *kv1, struct key_value *kv2,
size_t offset __unused)
{
struct bwstring *s1, *s2;
MD5_CTX ctx1, ctx2;
char *b1, *b2;
UNUSED_ARG(offset);
s1 = kv1->k;
s2 = kv2->k;
@ -1022,12 +1020,11 @@ randomcoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
* Implements version sort (-V).
*/
static int
versioncoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
versioncoll(struct key_value *kv1, struct key_value *kv2,
size_t offset __unused)
{
struct bwstring *s1, *s2;
UNUSED_ARG(offset);
s1 = kv1->k;
s2 = kv2->k;
@ -1098,7 +1095,8 @@ cmp_nans(double d1, double d2)
* Implements general numeric sort (-g).
*/
static int
gnumcoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
gnumcoll(struct key_value *kv1, struct key_value *kv2,
size_t offset __unused)
{
double d1, d2;
int err1, err2;
@ -1108,8 +1106,6 @@ gnumcoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
err1 = err2 = 0;
key1_read = key2_read = false;
UNUSED_ARG(offset);
if (debug_sort) {
bwsprintf(stdout, kv1->k, "; k1=<", ">");
bwsprintf(stdout, kv2->k, "; k2=<", ">");
@ -1256,7 +1252,7 @@ gnumcoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
* Implements month sort (-M).
*/
static int
monthcoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
monthcoll(struct key_value *kv1, struct key_value *kv2, size_t offset __unused)
{
int val1, val2;
bool key1_read, key2_read;
@ -1264,8 +1260,6 @@ monthcoll(struct key_value *kv1, struct key_value *kv2, size_t offset)
val1 = val2 = 0;
key1_read = key2_read = false;
UNUSED_ARG(offset);
if (debug_sort) {
bwsprintf(stdout, kv1->k, "; k1=<", ">");
bwsprintf(stdout, kv2->k, "; k2=<", ">");

2
usr.bin/sort/sort.h
View File

@ -41,8 +41,6 @@
#define VERSION "2.3-FreeBSD"
#define UNUSED_ARG(A) do { (void)(A); } while(0)
#ifdef WITHOUT_NLS
#define getstr(n) nlsstr[n]
#else