aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-12-19 04:28:35 +0000
committerMike Frysinger <vapier@gentoo.org>2011-12-19 04:28:35 +0000
commit3e9db307bd114e58fa10d9d1f38595ad5eae9fbb (patch)
tree40b075dc0f442398c3bf3cfe99e34599d374f77d
parentadd braces to fix -Wempty-body gcc warnings (diff)
downloadportage-utils-3e9db307bd114e58fa10d9d1f38595ad5eae9fbb.tar.gz
portage-utils-3e9db307bd114e58fa10d9d1f38595ad5eae9fbb.tar.bz2
portage-utils-3e9db307bd114e58fa10d9d1f38595ad5eae9fbb.zip
add _q_unused_ to fix -Wunused-parameter gcc warnings
-rw-r--r--applets.h4
-rw-r--r--libq/md5_sha1_sum.c2
-rw-r--r--main.c4
-rw-r--r--qdepends.c6
-rw-r--r--qxpak.c6
5 files changed, 11 insertions, 11 deletions
diff --git a/applets.h b/applets.h
index 8bfd200..772a59e 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 - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -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 d35abb1..ed6adf0 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 b0e02c8..4e43445 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 - <solar@gentoo.org>
* Copyright 2005-2008 Mike Frysinger - <vapier@gentoo.org>
@@ -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 a8e6f10..826b8c7 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 - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -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 28da5b9..d297b82 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 - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -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)