From 3e9db307bd114e58fa10d9d1f38595ad5eae9fbb Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 19 Dec 2011 04:28:35 +0000 Subject: add _q_unused_ to fix -Wunused-parameter gcc warnings --- applets.h | 4 ++-- libq/md5_sha1_sum.c | 2 +- main.c | 4 ++-- qdepends.c | 6 +++--- qxpak.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/applets.h b/applets.h index 8bfd2009..772a59e8 100644 --- a/applets.h +++ b/applets.h @@ -1,7 +1,7 @@ /* * Copyright 2005-2010 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/applets.h,v 1.27 2011/02/21 01:33:47 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/applets.h,v 1.28 2011/12/19 04:28:35 vapier Exp $ * * Copyright 2005-2010 Ned Ludd - * Copyright 2005-2010 Mike Frysinger - @@ -35,7 +35,7 @@ DECLARE_APPLET(qglsa) /* disable */ #undef DECLARE_APPLET #define DEFINE_APPLET_STUB(applet) \ - int applet##_main(int argc, char **argv) { \ + int applet##_main(_q_unused_ int argc, _q_unused_ char **argv) { \ err("Sorry, this applet has been disabled"); \ } diff --git a/libq/md5_sha1_sum.c b/libq/md5_sha1_sum.c index d35abb1e..ed6adf0f 100644 --- a/libq/md5_sha1_sum.c +++ b/libq/md5_sha1_sum.c @@ -32,7 +32,7 @@ /* pass in a fd and get back a fd; filename is for display only */ typedef int (*hash_cb_t) (int, const char *); -static int hash_cb_default(int fd, const char *filename) { return fd; } +static int hash_cb_default(int fd, _q_unused_ const char *filename) { return fd; } /* This might be useful elsewhere */ static unsigned char *hash_bin_to_hex(unsigned char *hash_value, diff --git a/main.c b/main.c index b0e02c87..4e43445d 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,7 @@ /* * Copyright 2005-2008 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.204 2011/12/18 20:35:25 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.205 2011/12/19 04:28:35 vapier Exp $ * * Copyright 2005-2008 Ned Ludd - * Copyright 2005-2008 Mike Frysinger - @@ -125,7 +125,7 @@ void no_colors() NULL #define COMMON_GETOPTS_CASES(applet) \ case 'v': ++verbose; break; \ - case 'q': ++quiet; if (freopen("/dev/null", "w", stderr)); break; \ + case 'q': ++quiet; if (freopen("/dev/null", "w", stderr)) { /* ignore errors */ } break; \ case 'V': version_barf( applet ## _rcsid ); break; \ case 'h': applet ## _usage(EXIT_SUCCESS); break; \ case 'C': no_colors(); break; \ diff --git a/qdepends.c b/qdepends.c index a8e6f10a..826b8c7f 100644 --- a/qdepends.c +++ b/qdepends.c @@ -1,7 +1,7 @@ /* * Copyright 2005-2010 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.54 2011/12/18 20:21:15 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.55 2011/12/19 04:28:35 vapier Exp $ * * Copyright 2005-2010 Ned Ludd - * Copyright 2005-2010 Mike Frysinger - @@ -30,7 +30,7 @@ static const char * const qdepends_opts_help[] = { "Show all DEPEND info", COMMON_OPTS_HELP }; -static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.54 2011/12/18 20:21:15 vapier Exp $"; +static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.55 2011/12/19 04:28:35 vapier Exp $"; #define qdepends_usage(ret) usage(ret, QDEPENDS_FLAGS, qdepends_long_opts, qdepends_opts_help, lookup_applet_idx("qdepends")) static char qdep_name_only = 0; @@ -278,7 +278,7 @@ this_node_sucks: if (root->neighbor) _dep_dump_tree(root->neighbor, space); } #else -void _dep_dump_tree(dep_node *root, int space) {;} +void _dep_dump_tree(_q_unused_ dep_node *root, _q_unused_ int space) {;} #endif void dep_burn_tree(dep_node *root) diff --git a/qxpak.c b/qxpak.c index 28da5b96..d297b82f 100644 --- a/qxpak.c +++ b/qxpak.c @@ -1,7 +1,7 @@ /* * Copyright 2005-2010 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/qxpak.c,v 1.23 2011/12/18 06:31:29 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/qxpak.c,v 1.24 2011/12/19 04:28:35 vapier Exp $ * * Copyright 2005-2010 Ned Ludd - * Copyright 2005-2010 Mike Frysinger - @@ -46,7 +46,7 @@ static const char * const qxpak_opts_help[] = { "Write files to stdout", COMMON_OPTS_HELP }; -static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.23 2011/12/18 06:31:29 vapier Exp $"; +static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.24 2011/12/19 04:28:35 vapier Exp $"; #define qxpak_usage(ret) usage(ret, QXPAK_FLAGS, qxpak_long_opts, qxpak_opts_help, lookup_applet_idx("qxpak")) typedef struct { @@ -140,7 +140,7 @@ static void _xpak_close(_xpak_archive *x) } static void -_xpak_list_callback(int dir_fd, char *pathname, _q_unused_ int pathname_len, +_xpak_list_callback(_q_unused_ int dir_fd, char *pathname, _q_unused_ int pathname_len, int data_offset, int data_len, _q_unused_ char *data) { if (!verbose) -- cgit v1.2.3-65-gdbad