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

List:       privoxy-commits
Subject:    [privoxy-commits] current pcrs.c,1.22,1.23
From:       noreply () sourceforge ! net
Date:       2006-12-29 17:53:09
Message-ID: E1H0Lun-0007IY-7T () mail ! sourceforge ! net
[Download RAW message or body]

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

Modified Files:
	pcrs.c 
Log Message:
Fixed gcc43 conversion warnings.


Index: pcrs.c
===================================================================
RCS file: /cvsroot/ijbswa/current/pcrs.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- pcrs.c	24 Dec 2006 17:34:20 -0000	1.22
+++ pcrs.c	29 Dec 2006 17:53:05 -0000	1.23
@@ -33,6 +33,9 @@
  *
  * Revisions   :
  *    $Log$
+ *    Revision 1.23  2006/12/29 17:53:05  fabiankeil
+ *    Fixed gcc43 conversion warnings.
+ *
  *    Revision 1.22  2006/12/24 17:34:20  fabiankeil
  *    Add pcrs_strerror() message for PCRE_ERROR_MATCHLIMIT
  *    and give a hint why an error code might be unknown.
@@ -351,7 +354,7 @@
    if (trivialflag)
    {
       text = strncpy(text, replacement, length + 1);
-      k = length;
+      k = (int)length;
    }
 
    /*
@@ -412,7 +415,7 @@
          if (replacement[i] == '$' && !quoted && i < (int)(length - 1))
          {
             char *symbol, symbols[] = "'`+&";
-            r->block_length[l] = k - r->block_offset[l];
+            r->block_length[l] = (size_t)(k - r->block_offset[l]);
 
             /* Numerical backreferences */
             if (isdigit((int)replacement[i + 1]))
@@ -477,7 +480,7 @@
     */
    r->text = text;
    r->backrefs = l;
-   r->block_length[l] = k - r->block_offset[l];
+   r->block_length[l] = (size_t)(k - r->block_offset[l]);
 
    return r;
 
@@ -849,12 +852,12 @@
       return(PCRS_ERR_BADJOB);
    }
 
-   if (NULL == (matches = (pcrs_match *)malloc(max_matches * sizeof(pcrs_match))))
+   if (NULL == (matches = (pcrs_match *)malloc((size_t)max_matches * \
sizeof(pcrs_match))))  {
       *result = NULL;
       return(PCRS_ERR_NOMEM);
    }
-   memset(matches, '\0', max_matches * sizeof(pcrs_match));
+   memset(matches, '\0', (size_t)max_matches * sizeof(pcrs_match));
 
 
    /*
@@ -873,29 +876,29 @@
          matches[i].submatch_offset[k] = offsets[2 * k];
 
          /* Note: Non-found optional submatches have length -1-(-1)==0 */
-         matches[i].submatch_length[k] = offsets[2 * k + 1] - offsets[2 * k]; 
+         matches[i].submatch_length[k] = (size_t)(offsets[2 * k + 1] - offsets[2 * \
k]);   
          /* reserve mem for each submatch as often as it is ref'd */
-         newsize += matches[i].submatch_length[k] * \
job->substitute->backref_count[k]; +         newsize += matches[i].submatch_length[k] \
* (size_t)job->substitute->backref_count[k];  }
       /* plus replacement text size minus match text size */
       newsize += strlen(job->substitute->text) - matches[i].submatch_length[0]; 
 
       /* chunk before match */
       matches[i].submatch_offset[PCRS_MAX_SUBMATCHES] = 0;
-      matches[i].submatch_length[PCRS_MAX_SUBMATCHES] = offsets[0];
-      newsize += offsets[0] * job->substitute->backref_count[PCRS_MAX_SUBMATCHES];
+      matches[i].submatch_length[PCRS_MAX_SUBMATCHES] = (size_t)offsets[0];
+      newsize += (size_t)offsets[0] * \
(size_t)job->substitute->backref_count[PCRS_MAX_SUBMATCHES];  
       /* chunk after match */
       matches[i].submatch_offset[PCRS_MAX_SUBMATCHES + 1] = offsets[1];
-      matches[i].submatch_length[PCRS_MAX_SUBMATCHES + 1] = subject_length - \
                offsets[1] - 1;
-      newsize += (subject_length - offsets[1]) * \
job->substitute->backref_count[PCRS_MAX_SUBMATCHES + 1]; +      \
matches[i].submatch_length[PCRS_MAX_SUBMATCHES + 1] = subject_length - \
(size_t)offsets[1] - 1; +      newsize += (subject_length - (size_t)offsets[1]) * \
(size_t)job->substitute->backref_count[PCRS_MAX_SUBMATCHES + 1];  
       /* Storage for matches exhausted? -> Extend! */
       if (++i >= max_matches)
       {
          max_matches = (int)(max_matches * PCRS_MAX_MATCH_GROW);
-         if (NULL == (dummy = (pcrs_match *)realloc(matches, max_matches * \
sizeof(pcrs_match)))) +         if (NULL == (dummy = (pcrs_match *)realloc(matches, \
(size_t)max_matches * sizeof(pcrs_match))))  {
             free(matches);
             *result = NULL;
@@ -950,7 +953,7 @@
    for (i = 0; i < matches_found; i++)
    {
       /* copy the chunk preceding the match */
-      memcpy(result_offset, subject + offset, (size_t)matches[i].submatch_offset[0] \
- offset);  +      memcpy(result_offset, subject + offset, \
(size_t)(matches[i].submatch_offset[0] - offset));   result_offset += \
matches[i].submatch_offset[0] - offset;  
       /* For every segment of the substitute.. */
@@ -978,11 +981,11 @@
             result_offset += \
matches[i].submatch_length[job->substitute->backref[k]];  }
       }
-      offset =  matches[i].submatch_offset[0] + matches[i].submatch_length[0];
+      offset =  matches[i].submatch_offset[0] + (int)matches[i].submatch_length[0];
    }
 
    /* Copy the rest. */
-   memcpy(result_offset, subject + offset, subject_length - offset);
+   memcpy(result_offset, subject + offset, subject_length - (size_t)offset);
 
    *result_length = newsize;
    free(matches);


-------------------------------------------------------------------------
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]