dlls/msi/streams.c type fixes

Gerald Pfeifer gerald at pfeifer.com
Sun Feb 17 06:23:38 CST 2008


This patch contains one or two items from my November patch the core
of which was independently recreated by Marcus and accepted and one
or two additional changes.  It addresses the following warnings:

  streams.c: In function 'streams_set_table_size':
  streams.c:59: warning: comparison between signed and unsigned
  streams.c: In function 'STREAMS_delete':
  streams.c:379: warning: comparison between signed and unsigned
  streams.c: In function 'STREAMS_find_matching_rows':
  streams.c:404: warning: comparison between signed and unsigned

Gerald

ChangeLog:
Adjust the signedness of three variables and add a comment for
add_streams_to_table().

Index: streams.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/streams.c,v
retrieving revision 1.11
diff -u -3 -p -r1.11 streams.c
--- streams.c	16 Feb 2008 15:59:26 -0000	1.11
+++ streams.c	17 Feb 2008 12:17:50 -0000
@@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
 typedef struct tabSTREAM
 {
-    int str_index;
+    UINT str_index;
     LPWSTR name;
     IStream *stream;
 } STREAM;
@@ -54,7 +54,7 @@ typedef struct tagMSISTREAMSVIEW
     UINT row_size;
 } MSISTREAMSVIEW;
 
-static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, int size)
+static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size)
 {
     if (size >= sv->max_streams)
     {
@@ -372,7 +372,7 @@ static UINT STREAMS_modify(struct tagMSI
 static UINT STREAMS_delete(struct tagMSIVIEW *view)
 {
     MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
-    int i;
+    UINT i;
 
     TRACE("(%p)\n", view);
 
@@ -440,6 +440,7 @@ static const MSIVIEWOPS streams_ops =
 };
 
 static INT add_streams_to_table(MSISTREAMSVIEW *sv)
+    /* Return -1 in case of error. */
 {
     IEnumSTATSTG *stgenum = NULL;
     STATSTG stat;



More information about the wine-patches mailing list