summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-05-18 04:10:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:06 -0500
commit8a9940b608e757a6e199fa9c215c48e7d19dd51a (patch)
treef68f7dbc82488e704e61d4a59e7cb226f172ad8c /source3
parent905bac92ba1b487e733b989089c649ea3b6cf4dc (diff)
downloadsamba-8a9940b608e757a6e199fa9c215c48e7d19dd51a.tar.gz
samba-8a9940b608e757a6e199fa9c215c48e7d19dd51a.tar.bz2
samba-8a9940b608e757a6e199fa9c215c48e7d19dd51a.zip
r15679: fix some popt warnings
(This used to be commit 126ab8ccec69240e8e526190f4712bd274237985)
Diffstat (limited to 'source3')
-rw-r--r--source3/popt/popt.c2
-rw-r--r--source3/popt/popt.h2
-rw-r--r--source3/popt/popthelp.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/popt/popt.c b/source3/popt/popt.c
index eb81c720f5..e9c4c17de5 100644
--- a/source3/popt/popt.c
+++ b/source3/popt/popt.c
@@ -1153,7 +1153,7 @@ const char * poptBadOption(poptContext con, int flags)
/*@=nullderef@*/
}
-const char *const poptStrerror(const int error)
+const char *poptStrerror(const int error)
{
switch (error) {
case POPT_ERROR_NOARG:
diff --git a/source3/popt/popt.h b/source3/popt/popt.h
index 6b5ee6b35f..08701d73b5 100644
--- a/source3/popt/popt.h
+++ b/source3/popt/popt.h
@@ -443,7 +443,7 @@ int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags)
* @param error popt error
* @return error string
*/
-/*@observer@*/ const char *const poptStrerror(const int error)
+/*@observer@*/ const char* poptStrerror(const int error)
/*@*/;
/** \ingroup popt
diff --git a/source3/popt/popthelp.c b/source3/popt/popthelp.c
index 56ba290574..70566a389e 100644
--- a/source3/popt/popthelp.c
+++ b/source3/popt/popthelp.c
@@ -67,7 +67,7 @@ struct poptOption poptHelpOptions[] = {
/**
* @param table option(s)
*/
-/*@observer@*/ /*@null@*/ static const char *const
+/*@observer@*/ /*@null@*/ static const char *
getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
/*@*/
{
@@ -85,7 +85,7 @@ getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
* @param opt option(s)
* @param translation_domain translation domain
*/
-/*@observer@*/ /*@null@*/ static const char *const
+/*@observer@*/ /*@null@*/ static const char *
getArgDescrip(const struct poptOption * opt,
/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
/*@null@*/ const char * translation_domain)