Rename remaining shhopt functions to start with 'pm_'

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1319 9d0c8265-081b-0410-96cb-a4ca84ce46f8

2 files changed, 11 insertions, 7 deletions

diff --git a/lib/util/shhopt.c b/lib/util/shhopt.c
index d789a03b..a557fcd5 100644
--- a/lib/util/shhopt.c
+++ b/lib/util/shhopt.c
@@ -514,12 +514,13 @@ optExecute(optEntry  const opt, char *arg, int lng)
  |                        that _must_ abort the program.
  */
 void
-optSetFatalFunc(void (*f)(const char *, ...))
-{
+pm_optSetFatalFunc(void (*f)(const char *, ...)) {
+
     optFatal = f;
 }
 
 
+
 /*------------------------------------------------------------------------
  |  NAME          pm_optParseOptions
  |
@@ -1008,7 +1009,7 @@ pm_optParseOptions3(int * const argc_p, char *argv[], const optStruct3 opt,
 
 
 void
-optDestroyNameValueList(struct optNameValue * const list) {
+pm_optDestroyNameValueList(struct optNameValue * const list) {
 
     unsigned int i;
 
diff --git a/lib/util/shhopt.h b/lib/util/shhopt.h
index 6fad0c33..6be7f411 100644
--- a/lib/util/shhopt.h
+++ b/lib/util/shhopt.h
@@ -218,9 +218,12 @@ struct optNameValue {
 
 
         
-void optSetFatalFunc(void (*f)(const char *, ...));
-void pm_optParseOptions(int *argc, char *argv[],
-		     optStruct opt[], int allowNegNum);
+void
+pm_optSetFatalFunc(void (*f)(const char *, ...));
+
+void
+pm_optParseOptions(int *argc, char *argv[],
+                   optStruct opt[], int allowNegNum);
 void
 pm_optParseOptions2(int * const argc_p, char *argv[], const optStruct2 opt, 
                  const unsigned long flags);
@@ -229,7 +232,7 @@ pm_optParseOptions3(int * const argc_p, char *argv[], const optStruct3 opt,
                  const unsigned int optStructSize, const unsigned long flags);
 
 void
-optDestroyNameValueList(struct optNameValue * const list);
+pm_optDestroyNameValueList(struct optNameValue * const list);
 
 #ifdef __cplusplus
 }