projects / privoxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: eeee463)
Deleted unused size parameter from filter_popups()
authoroes <oes@users.sourceforge.net>
Tue, 31 Jul 2001 14:44:22 +0000 (14:44 +0000)
committeroes <oes@users.sourceforge.net>
Tue, 31 Jul 2001 14:44:22 +0000 (14:44 +0000)
jcc.c patch | blob | history
killpopup.c patch | blob | history
killpopup.h patch | blob | history

diff --git a/jcc.c b/jcc.c
index aadc203..0cfb75c 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.33 2001/07/29 19:32:00 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.34 2001/07/30 22:08:36 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,12 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.33 2001/07/29 19:32:00 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.34  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
  *    Revision 1.33  2001/07/29 19:32:00  jongfoster
  *    Renaming _main() [mingw32 only] to real_main(), for ANSI compliance.
  *
@@ -854,7 +860,7 @@ static void chat(struct client_state *csp)
          /* Filter the popups on this read. */
          if (block_popups_now)
          {
-            filter_popups(buf, n);
+            filter_popups(buf);
          }
 #endif /* def FEATURE_KILL_POPUPS */
 
@@ -1028,7 +1034,7 @@ static void chat(struct client_state *csp)
                 * Filter the part of the body that came in the same read
                 * as the last headers:
                 */
-               filter_popups(csp->iob->cur, csp->iob->eod - csp->iob->cur);
+               filter_popups(csp->iob->cur);
             }
 
 #endif /* def FEATURE_KILL_POPUPS */
diff --git a/killpopup.c b/killpopup.c
index 77126ce..8a36e58 100644 (file)
--- a/killpopup.c
+++ b/killpopup.c
@@ -1,4 +1,4 @@
-const char killpopup_rcs[] = "$Id: killpopup.c,v 1.7 2001/07/20 19:29:25 haroon Exp $";
+const char killpopup_rcs[] = "$Id: killpopup.c,v 1.8 2001/07/30 22:08:36 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/killpopup.c,v $
@@ -32,6 +32,12 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.7 2001/07/20 19:29:25 haroon
  *
  * Revisions   :
  *    $Log: killpopup.c,v $
+ *    Revision 1.8  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
  *    Revision 1.7  2001/07/20 19:29:25  haroon
  *    - In v1.5 forgot to add that I implemented LOG_LEVEL_POPUPS in errlog.c,
  *      errlog.h and killpopup.c. In that case, it is superfluous to have define for
@@ -106,12 +112,11 @@ const char killpopup_h_rcs[] = KILLPOPUP_H_VERSION;
  *
  * Parameters  :
  *          1  :  buff = Buffer to scan and modify.  Null terminated.
- *          2  :  size = Buffer size, excluding null terminator.
  *
  * Returns     :  void
  *
  *********************************************************************/
-void filter_popups(char *buff, int size)
+void filter_popups(char *buff)
 {
    char *popup = NULL;
    char *close = NULL;
@@ -143,7 +148,7 @@ void filter_popups(char *buff, int size)
       }
    }
 
-   /* Filter all other crap like onUnload onExit etc.  (by BREITENB) NEW!*/
+   /* Filter onUnload and onExit */
    popup=strstr( buff, "<body");
    if (!popup) popup=strstr( buff, "<BODY");
    if (!popup) popup=strstr( buff, "<Body");
@@ -153,7 +158,7 @@ void filter_popups(char *buff, int size)
       close=strchr(popup,'>');
       if (close)
       {
-         /* we are now between <body and the ending > FIXME: No, we're anywhere! --oes*/
+         /* we are now between <body and the ending > FIXME: No, we're anywhere! --oes */
          p=strstr(popup, "onUnload");
          if (p)
          {
diff --git a/killpopup.h b/killpopup.h
index 78a7528..07ff1a7 100644 (file)
--- a/killpopup.h
+++ b/killpopup.h
@@ -1,6 +1,6 @@
 #ifndef KILLPOPUP_H_INCLUDED
 #define KILLPOPUP_H_INCLUDED
-#define KILLPOPUP_H_VERSION "$Id: killpopup.h,v 1.3 2001/07/29 18:59:21 jongfoster Exp $"
+#define KILLPOPUP_H_VERSION "$Id: killpopup.h,v 1.4 2001/07/30 22:08:36 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/killpopup.h,v $
@@ -34,6 +34,12 @@
  *
  * Revisions   :
  *    $Log: killpopup.h,v $
+ *    Revision 1.4  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
  *    Revision 1.3  2001/07/29 18:59:21  jongfoster
  *    - Changing #define _KILLPOPUP_H to KILLPOPUP_H_INCLUDED
  *    - Adding extern "C" {}
@@ -66,7 +72,7 @@ extern "C" {
 
 #ifdef FEATURE_KILL_POPUPS
 
-extern void filter_popups(char *buff, int size);
+extern void filter_popups(char *buff);
 
 #endif /* def FEATURE_KILL_POPUPS */
 
The official Privoxy git repository