Francois Gouget : msi: Move msi_get_cabinet_stream() up and make it static.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d685bfa548834db471aaaad9a938fe1ed1e40a71
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d685bfa548834db471aaaad9a9...

Author: Francois Gouget 
Date:   Mon Apr 18 11:19:31 2011 +0200

msi: Move msi_get_cabinet_stream() up and make it static.

---

dlls/msi/media.c   |   22 +++++++++++-----------
 dlls/msi/msipriv.h |    1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dlls/msi/media.c b/dlls/msi/media.c
index c261d7c..6675f2b 100644
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -117,6 +117,17 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)
     return r;
 }

+static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )
+{
+    MSICABINETSTREAM *cab;
+
+    LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry )
+    {
+        if (cab->disk_id == disk_id) return cab;
+    }
+    return NULL;
+}
+
 static void * CDECL cabinet_alloc(ULONG cb)
 {
     return msi_alloc(cb);
@@ -919,14 +930,3 @@ UINT msi_add_cabinet_stream( MSIPACKAGE *package, UINT disk_id, IStorage *storag

return ERROR_SUCCESS;
 }
-
-MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )
-{
-    MSICABINETSTREAM *cab;
-
-    LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry )
-    {
-        if (cab->disk_id == disk_id) return cab;
-    }
-    return NULL;
-}
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index c132477..848fe01 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -1018,7 +1018,6 @@ extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, M
 extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi);
 extern void msi_free_media_info(MSIMEDIAINFO *mi);
 extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data);
-extern MSICABINETSTREAM *msi_get_cabinet_stream(MSIPACKAGE *, UINT);
 extern UINT msi_add_cabinet_stream(MSIPACKAGE *, UINT, IStorage *, const WCHAR *);

/* control event stuff */