[prev in list] [next in list] [prev in thread] [next in thread] 

List:       privoxy-commits
Subject:    [privoxy-commits] current parsers.c,1.78,1.79 parsers.h,1.32,1.33
From:       noreply () sourceforge ! net
Date:       2006-12-29 18:04:43
Message-ID: E1H0M5z-00029S-KH () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/ijbswa/current
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3282

Modified Files:
	parsers.c parsers.h 
Log Message:
Fixed gcc43 conversion warnings.


Index: parsers.c
===================================================================
RCS file: /cvsroot/ijbswa/current/parsers.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- parsers.c	26 Dec 2006 17:19:20 -0000	1.78
+++ parsers.c	29 Dec 2006 18:04:40 -0000	1.79
@@ -45,6 +45,9 @@
  *
  * Revisions   :
  *    $Log$
+ *    Revision 1.79  2006/12/29 18:04:40  fabiankeil
+ *    Fixed gcc43 conversion warnings.
+ *
  *    Revision 1.78  2006/12/26 17:19:20  fabiankeil
  *    Bringing back the "useless" localtime() call
  *    I removed in revision 1.67. On some platforms
@@ -716,7 +719,7 @@
  *                or buffer limit reached.
  *
  *********************************************************************/
-jb_err add_to_iob(struct client_state *csp, char *buf, int n)
+jb_err add_to_iob(struct client_state *csp, char *buf, size_t n)
 {
    struct iob *iob = csp->iob;
    size_t used, offset, need, want;
@@ -724,8 +727,8 @@
 
    if (n <= 0) return JB_ERR_OK;
 
-   used   = iob->eod - iob->buf;
-   offset = iob->cur - iob->buf;
+   used   = (size_t)(iob->eod - iob->buf);
+   offset = (size_t)(iob->cur - iob->buf);
    need   = used + n + 1;
 
    /*
@@ -1621,7 +1624,7 @@
       }
       else
       {
-         rtime = difftime(now, last_modified);
+         rtime = (long int)difftime(now, last_modified);
          if (rtime)
          {
             rtime = pick_from_range(rtime);
@@ -2915,9 +2918,12 @@
  *********************************************************************/
 int strclean(const char *string, const char *substring)
 {
-   int hits = 0, len = strlen(substring);
+   int hits = 0;
+   size_t len;
    char *pos, *p;
 
+   len = strlen(substring);
+
    while((pos = strstr(string, substring)) != NULL)
    {
       p = pos + len;

Index: parsers.h
===================================================================
RCS file: /cvsroot/ijbswa/current/parsers.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- parsers.h	6 Dec 2006 19:14:23 -0000	1.32
+++ parsers.h	29 Dec 2006 18:04:40 -0000	1.33
@@ -43,6 +43,9 @@
  *
  * Revisions   :
  *    $Log$
+ *    Revision 1.33  2006/12/29 18:04:40  fabiankeil
+ *    Fixed gcc43 conversion warnings.
+ *
  *    Revision 1.32  2006/12/06 19:14:23  fabiankeil
  *    Added prototype for get_destination_from_headers().
  *
@@ -226,7 +229,7 @@
 extern const add_header_func_ptr add_server_headers[];
 
 extern int flush_socket(jb_socket fd, struct client_state *csp);
-extern jb_err add_to_iob(struct client_state *csp, char *buf, int n);
+extern jb_err add_to_iob(struct client_state *csp, char *buf, size_t n);
 extern char *get_header(struct client_state *csp);
 extern char *get_header_value(const struct list *header_list, const char \
*header_name);  extern char *sed(const struct parsers pats[], const \
add_header_func_ptr more_headers[], struct client_state *csp);


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
ijbswa-commits mailing list
ijbswa-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ijbswa-commits


[prev in list] [next in list] [prev in thread] [next in thread]