Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--applets.h4
-rw-r--r--libq/atom_compare.c4
-rw-r--r--main.c13
-rw-r--r--q.c6
-rw-r--r--qatom.c6
-rw-r--r--qcache.c8
-rw-r--r--qcheck.c6
-rw-r--r--qdepends.c8
-rw-r--r--qfile.c6
-rw-r--r--qglsa.c10
-rw-r--r--qgrep.c6
-rw-r--r--qlist.c6
-rw-r--r--qlop.c6
-rw-r--r--qmerge.c6
-rw-r--r--qpkg.c6
-rw-r--r--qsearch.c6
-rw-r--r--qsize.c6
-rw-r--r--qtbz2.c6
-rw-r--r--quse.c6
-rw-r--r--qxpak.c6
-rw-r--r--template.c6
21 files changed, 67 insertions, 70 deletions
diff --git a/applets.h b/applets.h
index 7191b11..8bfd200 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.26 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/applets.h,v 1.27 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -39,7 +39,7 @@ DECLARE_APPLET(qglsa) /* disable */
err("Sorry, this applet has been disabled"); \
}
-struct applet_t {
+static const struct applet_t {
const char *name;
APPLET func;
const char *opts;
diff --git a/libq/atom_compare.c b/libq/atom_compare.c
index ded6ad8..18bfe98 100644
--- a/libq/atom_compare.c
+++ b/libq/atom_compare.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/libq/atom_compare.c,v 1.6 2008/01/17 06:35:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/atom_compare.c,v 1.7 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2008 Mike Frysinger - <vapier@gentoo.org>
@@ -17,7 +17,7 @@ typedef struct {
} depend_atom;
*/
-const char *booga[] = {"!!!", "!=", "==", ">", "<"};
+const char * const booga[] = {"!!!", "!=", "==", ">", "<"};
enum { ERROR=0, NOT_EQUAL, EQUAL, NEWER, OLDER };
/* a1 <return value> a2
* foo-1 <EQUAL> foo-1
diff --git a/main.c b/main.c
index 41cb98e..e829bb6 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.179 2010/12/19 13:15:31 grobian Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.180 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2008 Mike Frysinger - <vapier@gentoo.org>
@@ -57,7 +57,7 @@ char reinitialize_metacache = 0;
char portdir[_Q_PATH_MAX] = EPREFIX "/usr/portage";
char portarch[20] = "";
char portvdb[_Q_PATH_MAX] = "var/db/pkg";
-char portcachedir[] = "metadata/cache";
+const char portcachedir[] = "metadata/cache";
char portroot[_Q_PATH_MAX] = "/";
char config_protect[_Q_PATH_MAX] = EPREFIX "/etc/";
@@ -69,7 +69,7 @@ char features[2048] = "noman noinfo nodoc";
char accept_license[512] = "*";
char install_mask[BUFSIZ] = "";
-const char *err_noapplet = "Sorry this applet was disabled at compile time";
+const char err_noapplet[] = "Sorry this applet was disabled at compile time";
/* helper functions for showing errors */
static const char *argv0;
@@ -125,11 +125,8 @@ void no_colors()
default: applet ## _usage(EXIT_FAILURE); break;
/* display usage and exit */
-void usage(int status, const char *flags, struct option const opts[],
- const char *help[], int blabber);
-
-void usage(int status, const char *flags, struct option const opts[],
- const char *help[], int blabber)
+static void usage(int status, const char *flags, struct option const opts[],
+ const char * const help[], int blabber)
{
unsigned long i;
if (blabber == 0) {
diff --git a/q.c b/q.c
index 14f9bdd..441bd32 100644
--- a/q.c
+++ b/q.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/q.c,v 1.48 2010/07/19 00:25:13 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.49 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -15,14 +15,14 @@ static struct option const q_long_opts[] = {
{"modpath", a_argument, NULL, 'M'},
COMMON_LONG_OPTS
};
-static const char *q_opts_help[] = {
+static const char * const q_opts_help[] = {
"Install symlinks for applets",
"Reinitialize ebuild cache",
"Reinitialize metadata cache",
"Module path",
COMMON_OPTS_HELP
};
-static const char q_rcsid[] = "$Id: q.c,v 1.48 2010/07/19 00:25:13 vapier Exp $";
+static const char q_rcsid[] = "$Id: q.c,v 1.49 2011/02/21 01:33:47 vapier Exp $";
#define q_usage(ret) usage(ret, Q_FLAGS, q_long_opts, q_opts_help, lookup_applet_idx("q"))
static APPLET lookup_applet(const char *applet)
diff --git a/qatom.c b/qatom.c
index 2ae023a..9cdd272 100644
--- a/qatom.c
+++ b/qatom.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/qatom.c,v 1.7 2008/01/15 08:06:09 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qatom.c,v 1.8 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2008 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2008 Mike Frysinger - <vapier@gentoo.org>
@@ -14,12 +14,12 @@ static struct option const qatom_long_opts[] = {
{"compare", no_argument, NULL, 'c'},
COMMON_LONG_OPTS
};
-static const char *qatom_opts_help[] = {
+static const char * const qatom_opts_help[] = {
"Compare two atoms",
COMMON_OPTS_HELP
};
-static const char qatom_rcsid[] = "$Id: qatom.c,v 1.7 2008/01/15 08:06:09 vapier Exp $";
+static const char qatom_rcsid[] = "$Id: qatom.c,v 1.8 2011/02/21 01:33:47 vapier Exp $";
#define qatom_usage(ret) usage(ret, QATOM_FLAGS, qatom_long_opts, qatom_opts_help, lookup_applet_idx("qatom"))
int qatom_main(int argc, char **argv)
diff --git a/qcache.c b/qcache.c
index 500a792..cd88b28 100644
--- a/qcache.c
+++ b/qcache.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/qcache.c,v 1.37 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcache.c,v 1.38 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2006 Thomas A. Cort - <tcort@gentoo.org>
*/
@@ -35,7 +35,7 @@ static struct option const qcache_long_opts[] = {
COMMON_LONG_OPTS
};
-static const char *qcache_opts_help[] = {
+static const char * const qcache_opts_help[] = {
"match pkgname",
"match catname",
"list packages that can be marked stable on a given arch",
@@ -47,7 +47,7 @@ static const char *qcache_opts_help[] = {
COMMON_OPTS_HELP
};
-static const char qcache_rcsid[] = "$Id: qcache.c,v 1.37 2010/04/07 05:58:16 solar Exp $";
+static const char qcache_rcsid[] = "$Id: qcache.c,v 1.38 2011/02/21 01:33:47 vapier Exp $";
#define qcache_usage(ret) usage(ret, QCACHE_FLAGS, qcache_long_opts, qcache_opts_help, lookup_applet_idx("qcache"))
/********************************************************************/
@@ -76,7 +76,7 @@ typedef struct {
static char **archlist; /* Read from PORTDIR/profiles/arch.list in qcache_init() */
static unsigned int archlist_count;
-char status[3] = {'-', '~', '+'};
+const char status[3] = {'-', '~', '+'};
int qcache_skip, qcache_test_arch, qcache_last = 0;
char *qcache_matchpkg = NULL, *qcache_matchcat = NULL;
diff --git a/qcheck.c b/qcheck.c
index fc3cf9b..cd7eb1e 100644
--- a/qcheck.c
+++ b/qcheck.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/qcheck.c,v 1.45 2010/06/08 05:38:17 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.46 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -21,7 +21,7 @@ static struct option const qcheck_long_opts[] = {
{"nomtime", no_argument, NULL, 'T'},
COMMON_LONG_OPTS
};
-static const char *qcheck_opts_help[] = {
+static const char * const qcheck_opts_help[] = {
"List all packages",
"Exact match (only CAT/PN or PN without PV)",
"Ignore files matching the regular expression <arg>",
@@ -32,7 +32,7 @@ static const char *qcheck_opts_help[] = {
"Ignore differing file mtimes",
COMMON_OPTS_HELP
};
-static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.45 2010/06/08 05:38:17 vapier Exp $";
+static const char qcheck_rcsid[] = "$Id: qcheck.c,v 1.46 2011/02/21 01:33:47 vapier Exp $";
#define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qcheck_opts_help, lookup_applet_idx("qcheck"))
short bad_only = 0;
diff --git a/qdepends.c b/qdepends.c
index 0d20213..7611dcb 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.50 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qdepends.c,v 1.51 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -20,7 +20,7 @@ static struct option const qdepends_long_opts[] = {
{"all", no_argument, NULL, 'a'},
COMMON_LONG_OPTS
};
-static const char *qdepends_opts_help[] = {
+static const char * const qdepends_opts_help[] = {
"Show DEPEND info (default)",
"Show RDEPEND info",
"Show PDEPEND info",
@@ -30,7 +30,7 @@ static const char *qdepends_opts_help[] = {
"Show all DEPEND info",
COMMON_OPTS_HELP
};
-static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.50 2010/04/07 05:58:16 solar Exp $";
+static const char qdepends_rcsid[] = "$Id: qdepends.c,v 1.51 2011/02/21 01:33:47 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;
@@ -44,7 +44,7 @@ typedef enum {
DEP_GROUP = 4
} dep_type;
#ifdef EBUG
-static const char *_dep_names[] = { "NULL", "NORM", "USE", "OR", "GROUP" };
+static const char * const _dep_names[] = { "NULL", "NORM", "USE", "OR", "GROUP" };
#endif
struct _dep_node {
diff --git a/qfile.c b/qfile.c
index e07d83e..e7522e3 100644
--- a/qfile.c
+++ b/qfile.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/qfile.c,v 1.53 2010/07/19 00:25:13 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qfile.c,v 1.54 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -24,7 +24,7 @@ static struct option const qfile_long_opts[] = {
{"slots", no_argument, NULL, 'S'},
COMMON_LONG_OPTS
};
-static const char *qfile_opts_help[] = {
+static const char * const qfile_opts_help[] = {
"Exact match",
"Read arguments from file <arg> (\"-\" for stdin)",
"Treat from file arguments by groups of <arg> (defaults to " QFILE_DEFAULT_MAX_ARGS_STR ")",
@@ -34,7 +34,7 @@ static const char *qfile_opts_help[] = {
"Display installed packages with slots",
COMMON_OPTS_HELP
};
-static char qfile_rcsid[] = "$Id: qfile.c,v 1.53 2010/07/19 00:25:13 vapier Exp $";
+static const char qfile_rcsid[] = "$Id: qfile.c,v 1.54 2011/02/21 01:33:47 vapier Exp $";
#define qfile_usage(ret) usage(ret, QFILE_FLAGS, qfile_long_opts, qfile_opts_help, lookup_applet_idx("qfile"))
#define qfile_is_prefix(path, prefix, prefix_length) \
diff --git a/qglsa.c b/qglsa.c
index ebc9817..eeb39ab 100644
--- a/qglsa.c
+++ b/qglsa.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/qglsa.c,v 1.12 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qglsa.c,v 1.13 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -21,7 +21,7 @@ static struct option const qglsa_long_opts[] = {
{"inject", no_argument, NULL, 'i'},
COMMON_LONG_OPTS
};
-static const char *qglsa_opts_help[] = {
+static const char * const qglsa_opts_help[] = {
"List GLSAs",
"Dump info about GLSAs",
"Test if system is affected by GLSAs",
@@ -30,7 +30,7 @@ static const char *qglsa_opts_help[] = {
"Mark specified GLSAs as fixed",
COMMON_OPTS_HELP
};
-static const char qglsa_rcsid[] = "$Id: qglsa.c,v 1.12 2010/04/07 05:58:16 solar Exp $";
+static const char qglsa_rcsid[] = "$Id: qglsa.c,v 1.13 2011/02/21 01:33:47 vapier Exp $";
#define qglsa_usage(ret) usage(ret, QGLSA_FLAGS, qglsa_long_opts, qglsa_opts_help, lookup_applet_idx("qglsa"))
static char *qglsa_load_list(void);
@@ -142,10 +142,10 @@ static char *qglsa_get_xml_tag(const char *xml_buf, const char *tag)
}
/*
-static const char *qglsa_opts_glsa[] = {
+static const char * const qglsa_opts_glsa[] = {
"le", "lt", "eq", "gt", "ge", "rge", "rle", "rgt", "rlt", NULL
};
-static const char *qglsa_opts_portage[] = {
+static const char * const qglsa_opts_portage[] = {
"<=", "<", "=", ">", ">=", ">=~", "<=~", " >~", " <~", NULL
};
diff --git a/qgrep.c b/qgrep.c
index 2e06c19..14facff 100644
--- a/qgrep.c
+++ b/qgrep.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/qgrep.c,v 1.27 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qgrep.c,v 1.28 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -29,7 +29,7 @@ static struct option const qgrep_long_opts[] = {
{"after", a_argument, NULL, 'A'},
COMMON_LONG_OPTS
};
-static const char *qgrep_opts_help[] = {
+static const char * const qgrep_opts_help[] = {
"Select non-matching lines",
"Ignore case distinctions",
"Print the filename for each match",
@@ -47,7 +47,7 @@ static const char *qgrep_opts_help[] = {
"Print <arg> lines of trailing context",
COMMON_OPTS_HELP
};
-static const char qgrep_rcsid[] = "$Id: qgrep.c,v 1.27 2010/04/07 05:58:16 solar Exp $";
+static const char qgrep_rcsid[] = "$Id: qgrep.c,v 1.28 2011/02/21 01:33:47 vapier Exp $";
#define qgrep_usage(ret) usage(ret, QGREP_FLAGS, qgrep_long_opts, qgrep_opts_help, lookup_applet_idx("qgrep"))
char qgrep_name_match(const char*, const int, depend_atom**);
diff --git a/qlist.c b/qlist.c
index 89dc7ec..13b0be8 100644
--- a/qlist.c
+++ b/qlist.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/qlist.c,v 1.57 2010/12/04 12:16:57 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.58 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -26,7 +26,7 @@ static struct option const qlist_long_opts[] = {
/* {"file", a_argument, NULL, 'f'}, */
COMMON_LONG_OPTS
};
-static const char *qlist_opts_help[] = {
+static const char * const qlist_opts_help[] = {
"Just show installed packages",
"Display installed packages with slots",
"Display : as the slot separator",
@@ -41,7 +41,7 @@ static const char *qlist_opts_help[] = {
/* "query filename for pkgname", */
COMMON_OPTS_HELP
};
-static const char qlist_rcsid[] = "$Id: qlist.c,v 1.57 2010/12/04 12:16:57 vapier Exp $";
+static const char qlist_rcsid[] = "$Id: qlist.c,v 1.58 2011/02/21 01:33:47 vapier Exp $";
#define qlist_usage(ret) usage(ret, QLIST_FLAGS, qlist_long_opts, qlist_opts_help, lookup_applet_idx("qlist"))
extern char *grab_vdb_item(const char *, const char *, const char *);
diff --git a/qlop.c b/qlop.c
index b3dca0a..d11f1af 100644
--- a/qlop.c
+++ b/qlop.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/qlop.c,v 1.54 2010/07/19 00:29:58 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlop.c,v 1.55 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -41,7 +41,7 @@ static struct option const qlop_long_opts[] = {
{"logfile", a_argument, NULL, 'f'},
COMMON_LONG_OPTS
};
-static const char *qlop_opts_help[] = {
+static const char * const qlop_opts_help[] = {
"Gauge number of times a package has been merged",
"Calculate merge time for a specific package",
"Print seconds in human readable format (needs -t)",
@@ -52,7 +52,7 @@ static const char *qlop_opts_help[] = {
"Read emerge logfile instead of " QLOP_DEFAULT_LOGFILE,
COMMON_OPTS_HELP
};
-static const char qlop_rcsid[] = "$Id: qlop.c,v 1.54 2010/07/19 00:29:58 vapier Exp $";
+static const char qlop_rcsid[] = "$Id: qlop.c,v 1.55 2011/02/21 01:33:47 vapier Exp $";
#define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, lookup_applet_idx("qlop"))
#define QLOP_LIST 0x01
diff --git a/qmerge.c b/qmerge.c
index 8abdb83..f2cf006 100644
--- a/qmerge.c
+++ b/qmerge.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/qmerge.c,v 1.96 2010/07/19 00:25:13 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.97 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -41,7 +41,7 @@ static struct option const qmerge_long_opts[] = {
COMMON_LONG_OPTS
};
-static const char *qmerge_opts_help[] = {
+static const char * const qmerge_opts_help[] = {
"Fetch package and newest Packages metadata",
"Fetch package (skipping Packages)",
"Search available packages",
@@ -55,7 +55,7 @@ static const char *qmerge_opts_help[] = {
COMMON_OPTS_HELP
};
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.96 2010/07/19 00:25:13 vapier Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.97 2011/02/21 01:33:47 vapier Exp $";
#define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
char search_pkgs = 0;
diff --git a/qpkg.c b/qpkg.c
index c53e957..892aaaf 100644
--- a/qpkg.c
+++ b/qpkg.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/qpkg.c,v 1.30 2011/01/11 03:13:48 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qpkg.c,v 1.31 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -17,14 +17,14 @@ static struct option const qpkg_long_opts[] = {
{"pkgdir", a_argument, NULL, 'P'},
COMMON_LONG_OPTS
};
-static const char *qpkg_opts_help[] = {
+static const char * const qpkg_opts_help[] = {
"clean pkgdir of unused binary files",
"clean pkgdir of files not in the tree anymore (slow)",
"pretend only",
"alternate package directory",
COMMON_OPTS_HELP
};
-static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.30 2011/01/11 03:13:48 vapier Exp $";
+static const char qpkg_rcsid[] = "$Id: qpkg.c,v 1.31 2011/02/21 01:33:47 vapier Exp $";
#define qpkg_usage(ret) usage(ret, QPKG_FLAGS, qpkg_long_opts, qpkg_opts_help, lookup_applet_idx("qpkg"))
extern char pretend;
diff --git a/qsearch.c b/qsearch.c
index 470fc9f..7cd9019 100644
--- a/qsearch.c
+++ b/qsearch.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/qsearch.c,v 1.39 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsearch.c,v 1.40 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -20,7 +20,7 @@ static struct option const qsearch_long_opts[] = {
{"homepage", no_argument, NULL, 'H'},
COMMON_LONG_OPTS
};
-static const char *qsearch_opts_help[] = {
+static const char * const qsearch_opts_help[] = {
"List the descriptions of every package in the cache",
"Use the portage cache (default)",
"Use the portage ebuild tree",
@@ -30,7 +30,7 @@ static const char *qsearch_opts_help[] = {
"Show homepage info",
COMMON_OPTS_HELP
};
-static const char qsearch_rcsid[] = "$Id: qsearch.c,v 1.39 2010/04/07 05:58:16 solar Exp $";
+static const char qsearch_rcsid[] = "$Id: qsearch.c,v 1.40 2011/02/21 01:33:47 vapier Exp $";
#define qsearch_usage(ret) usage(ret, QSEARCH_FLAGS, qsearch_long_opts, qsearch_opts_help, lookup_applet_idx("qsearch"))
int qsearch_main(int argc, char **argv)
diff --git a/qsize.c b/qsize.c
index 92a81ea..fda69eb 100644
--- a/qsize.c
+++ b/qsize.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/qsize.c,v 1.35 2010/07/04 20:04:06 flameeyes Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qsize.c,v 1.36 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -21,7 +21,7 @@ static struct option const qsize_long_opts[] = {
{"ignore", a_argument, NULL, 'i'},
COMMON_LONG_OPTS
};
-static const char *qsize_opts_help[] = {
+static const char * const qsize_opts_help[] = {
"Show size used on disk",
"Size all installed packages",
"Include a summary",
@@ -32,7 +32,7 @@ static const char *qsize_opts_help[] = {
"Ignore regexp string",
COMMON_OPTS_HELP
};
-static const char qsize_rcsid[] = "$Id: qsize.c,v 1.35 2010/07/04 20:04:06 flameeyes Exp $";
+static const char qsize_rcsid[] = "$Id: qsize.c,v 1.36 2011/02/21 01:33:47 vapier Exp $";
#define qsize_usage(ret) usage(ret, QSIZE_FLAGS, qsize_long_opts, qsize_opts_help, lookup_applet_idx("qsize"))
int qsize_main(int argc, char **argv)
diff --git a/qtbz2.c b/qtbz2.c
index f19a649..f757784 100644
--- a/qtbz2.c
+++ b/qtbz2.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/qtbz2.c,v 1.16 2010/06/08 05:31:09 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qtbz2.c,v 1.17 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -36,7 +36,7 @@ static struct option const qtbz2_long_opts[] = {
{"stdout", no_argument, NULL, 'O'},
COMMON_LONG_OPTS
};
-static const char *qtbz2_opts_help[] = {
+static const char * const qtbz2_opts_help[] = {
"Join tar.bz2 + xpak into a tbz2",
"Split a tbz2 into a tar.bz2 + xpak",
"Just split the tar.bz2",
@@ -44,7 +44,7 @@ static const char *qtbz2_opts_help[] = {
"Write files to stdout",
COMMON_OPTS_HELP
};
-static const char qtbz2_rcsid[] = "$Id: qtbz2.c,v 1.16 2010/06/08 05:31:09 vapier Exp $";
+static const char qtbz2_rcsid[] = "$Id: qtbz2.c,v 1.17 2011/02/21 01:33:47 vapier Exp $";
#define qtbz2_usage(ret) usage(ret, QTBZ2_FLAGS, qtbz2_long_opts, qtbz2_opts_help, lookup_applet_idx("qtbz2"))
static char tbz2_stdout = 0;
diff --git a/quse.c b/quse.c
index 12d9fbb..7a1c323 100644
--- a/quse.c
+++ b/quse.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/quse.c,v 1.62 2011/02/13 09:55:06 grobian Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/quse.c,v 1.63 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -25,7 +25,7 @@ static struct option const quse_long_opts[] = {
{"name-only", no_argument, NULL, 'N'},
COMMON_LONG_OPTS
};
-static const char *quse_opts_help[] = {
+static const char * const quse_opts_help[] = {
"Show exact non regexp matching using strcmp",
"Show annoying things in IUSE",
"Use the KEYWORDS vs IUSE",
@@ -35,7 +35,7 @@ static const char *quse_opts_help[] = {
"Only show package name",
COMMON_OPTS_HELP
};
-static const char quse_rcsid[] = "$Id: quse.c,v 1.62 2011/02/13 09:55:06 grobian Exp $";
+static const char quse_rcsid[] = "$Id: quse.c,v 1.63 2011/02/21 01:33:47 vapier Exp $";
#define quse_usage(ret) usage(ret, QUSE_FLAGS, quse_long_opts, quse_opts_help, lookup_applet_idx("quse"))
int quse_describe_flag(int ind, int argc, char **argv);
diff --git a/qxpak.c b/qxpak.c
index 96c73da..51ea87d 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.20 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qxpak.c,v 1.21 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -38,7 +38,7 @@ static struct option const qxpak_long_opts[] = {
{"stdout", no_argument, NULL, 'O'},
COMMON_LONG_OPTS
};
-static const char *qxpak_opts_help[] = {
+static const char * const qxpak_opts_help[] = {
"List the contents of an archive",
"Extract the contents of an archive",
"Create an archive of a directory/files",
@@ -46,7 +46,7 @@ static const char *qxpak_opts_help[] = {
"Write files to stdout",
COMMON_OPTS_HELP
};
-static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.20 2010/04/07 05:58:16 solar Exp $";
+static const char qxpak_rcsid[] = "$Id: qxpak.c,v 1.21 2011/02/21 01:33:47 vapier Exp $";
#define qxpak_usage(ret) usage(ret, QXPAK_FLAGS, qxpak_long_opts, qxpak_opts_help, lookup_applet_idx("qxpak"))
typedef struct {
diff --git a/template.c b/template.c
index 4eee6fd..b732161 100644
--- a/template.c
+++ b/template.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/template.c,v 1.14 2010/04/07 05:58:16 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/template.c,v 1.15 2011/02/21 01:33:47 vapier Exp $
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
* Copyright 2005-2010 Mike Frysinger - <vapier@gentoo.org>
@@ -13,11 +13,11 @@
static struct option const qtemp_long_opts[] = {
COMMON_LONG_OPTS
};
-static const char *qtemp_opts_help[] = {
+static const char * const qtemp_opts_help[] = {
COMMON_OPTS_HELP
};
-static const char qtemp_rcsid[] = "$Id: template.c,v 1.14 2010/04/07 05:58:16 solar Exp $";
+static const char qtemp_rcsid[] = "$Id: template.c,v 1.15 2011/02/21 01:33:47 vapier Exp $";
#define qtemp_usage(ret) usage(ret, QTEMP_FLAGS, qtemp_long_opts, qtemp_opts_help, lookup_applet_idx("qtemp"))
int qtemp_main(int argc, char **argv)