X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=showargs.c;h=b80b199353492d1b87ed1383bd1f70e541800541;hb=bea030265dce2024690556770debbd9dad4f9d15;hp=1163296197c458c1859071ff582144260f81119a;hpb=c53b1d365affbaa1a32b6fcb9fedb23180b03d3f;p=privoxy.git

diff --git a/showargs.c b/showargs.c
index 11632961..b80b1993 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,4 +1,4 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.21 2001/07/30 22:08:36 jongfoster Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.23 2001/08/02 22:03:23 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/showargs.c,v $
@@ -34,6 +34,12 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.21 2001/07/30 22:08:36 jongfost
  *
  * Revisions   :
  *    $Log: showargs.c,v $
+ *    Revision 1.23  2001/08/02 22:03:23  jongfoster
+ *    Fixing an unterminated character constant.
+ *
+ *    Revision 1.22  2001/08/01 00:20:57  jongfoster
+ *    Changing show_defines so that it doesn't contain any HTML.
+ *
  *    Revision 1.21  2001/07/30 22:08:36  jongfoster
  *    Tidying up #defines:
  *    - All feature #defines are now of the form FEATURE_xxx
@@ -372,108 +378,106 @@ char *show_rcs(void)
  * Returns     :  string 
  *
  *********************************************************************/
-struct map * show_defines(struct map *exports)
+void show_defines(struct map *exports)
 {
 
 #ifdef FEATURE_ACL
-   exports = map_conditional(exports, "FEATURE_ACL", 1);
+   map_conditional(exports, "FEATURE_ACL", 1);
 #else /* ifndef FEATURE_ACL */
-   exports = map_conditional(exports, "FEATURE_ACL", 0);
+   map_conditional(exports, "FEATURE_ACL", 0);
 #endif /* ndef FEATURE_ACL */
 
 #ifdef FEATURE_COOKIE_JAR
-   exports = map_conditional(exports, "FEATURE_COOKIE_JAR", 1);
+   map_conditional(exports, "FEATURE_COOKIE_JAR", 1);
 #else /* ifndef FEATURE_COOKIE_JAR */
-   exports = map_conditional(exports, "FEATURE_COOKIE_JAR", 0);
+   map_conditional(exports, "FEATURE_COOKIE_JAR", 0);
 #endif /* ndef FEATURE_COOKIE_JAR */
 
 #ifdef FEATURE_DENY_GZIP
-   exports = map_conditional(exports, "FEATURE_DENY_GZIP", 1);
+   map_conditional(exports, "FEATURE_DENY_GZIP", 1);
 #else /* ifndef FEATURE_DENY_GZIP */
-   exports = map_conditional(exports, "FEATURE_DENY_GZIP", 0);
+   map_conditional(exports, "FEATURE_DENY_GZIP", 0);
 #endif /* ndef FEATURE_DENY_GZIP */
 
 #ifdef FEATURE_FAST_REDIRECTS
-   exports = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1);
+   map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1);
 #else /* ifndef FEATURE_FAST_REDIRECTS */
-   exports = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 0);
+   map_conditional(exports, "FEATURE_FAST_REDIRECTS", 0);
 #endif /* ndef FEATURE_FAST_REDIRECTS */
 
 #ifdef FEATURE_FORCE_LOAD
-   exports = map_conditional(exports, "FEATURE_FORCE_LOAD", 1);
+   map_conditional(exports, "FEATURE_FORCE_LOAD", 1);
 #else /* ifndef FEATURE_FORCE_LOAD */
-   exports = map_conditional(exports, "FEATURE_FORCE_LOAD", 0);
+   map_conditional(exports, "FEATURE_FORCE_LOAD", 0);
 #endif /* ndef FEATURE_FORCE_LOAD */
 
 #ifdef FEATURE_IMAGE_BLOCKING
-   exports = map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 1);
+   map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 1);
 #else /* ifndef FEATURE_IMAGE_BLOCKING */
-   exports = map_conditional(exports, "FEATURE_IMAGE_BLOCKING, 0);
+   map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 0);
 #endif /* ndef FEATURE_IMAGE_BLOCKING */
 
 #ifdef FEATURE_IMAGE_DETECT_MSIE
-   exports = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 1);
+   map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 1);
 #else /* ifndef FEATURE_IMAGE_DETECT_MSIE */
-   exports = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0);
+   map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0);
 #endif /* ndef FEATURE_IMAGE_DETECT_MSIE */
 
 #ifdef FEATURE_KILL_POPUPS
-   exports = map_conditional(exports, "FEATURE_KILL_POPUPS", 1);
+   map_conditional(exports, "FEATURE_KILL_POPUPS", 1);
 #else /* ifndef FEATURE_KILL_POPUPS */
-   exports = map_conditional(exports, "FEATURE_KILL_POPUPS", 0);
+   map_conditional(exports, "FEATURE_KILL_POPUPS", 0);
 #endif /* ndef FEATURE_KILL_POPUPS */
 
 #ifdef FEATURE_PTHREAD
-   exports = map_conditional(exports, "FEATURE_PTHREAD", 1);
+   map_conditional(exports, "FEATURE_PTHREAD", 1);
 #else /* ifndef FEATURE_PTHREAD */
-   exports = map_conditional(exports, "FEATURE_PTHREAD", 0);
+   map_conditional(exports, "FEATURE_PTHREAD", 0);
 #endif /* ndef FEATURE_PTHREAD */
 
 #ifdef FEATURE_STATISTICS
-   exports = map_conditional(exports, "FEATURE_STATISTICS", 1);
+   map_conditional(exports, "FEATURE_STATISTICS", 1);
 #else /* ifndef FEATURE_STATISTICS */
-   exports = map_conditional(exports, "FEATURE_STATISTICS", 0);
+   map_conditional(exports, "FEATURE_STATISTICS", 0);
 #endif /* ndef FEATURE_STATISTICS */
 
 #ifdef FEATURE_TOGGLE
-   exports = map_conditional(exports, "FEATURE_TOGGLE", 1);
+   map_conditional(exports, "FEATURE_TOGGLE", 1);
 #else /* ifndef FEATURE_TOGGLE */
-   exports = map_conditional(exports, "FEATURE_TOGGLE", 0);
+   map_conditional(exports, "FEATURE_TOGGLE", 0);
 #endif /* ndef FEATURE_TOGGLE */
 
 #ifdef FEATURE_TRUST
-   exports = map_conditional(exports, "FEATURE_TRUST", 1);
+   map_conditional(exports, "FEATURE_TRUST", 1);
 #else /* ifndef FEATURE_TRUST */
-   exports = map_conditional(exports, "FEATURE_TRUST", 0);
+   map_conditional(exports, "FEATURE_TRUST", 0);
 #endif /* ndef FEATURE_TRUST */
 
 #ifdef REGEX_GNU
-   exports = map_conditional(exports, "REGEX_GNU", 1);
+   map_conditional(exports, "REGEX_GNU", 1);
 #else /* ifndef REGEX_GNU */
-   exports = map_conditional(exports, "REGEX_GNU", 0);
+   map_conditional(exports, "REGEX_GNU", 0);
 #endif /* def REGEX_GNU */
 
 #ifdef REGEX_PCRE
-   exports = map_conditional(exports, "REGEX_PCRE", 1);
+   map_conditional(exports, "REGEX_PCRE", 1);
 #else /* ifndef REGEX_PCRE */
-   exports = map_conditional(exports, "REGEX_PCRE", 0);
+   map_conditional(exports, "REGEX_PCRE", 0);
 #endif /* def REGEX_PCRE */
 
 #ifdef STATIC_PCRE
-   exports = map_conditional(exports, "STATIC_PCRE", 1);
+   map_conditional(exports, "STATIC_PCRE", 1);
 #else /* ifndef STATIC_PCRE */
-   exports = map_conditional(exports, "STATIC_PCRE", 0);
+   map_conditional(exports, "STATIC_PCRE", 0);
 #endif /* ndef STATIC_PCRE */
 
 #ifdef STATIC_PCRS
-   exports = map_conditional(exports, "STATIC_PCRS", 1);
+   map_conditional(exports, "STATIC_PCRS", 1);
 #else /* ifndef STATIC_PCRS */
-   exports = map_conditional(exports, "STATIC_PCRS", 0);
+   map_conditional(exports, "STATIC_PCRS", 0);
 #endif /* ndef STATIC_PCRS */
 
-   exports = map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);
-
-   return exports;
+   map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);
 }