Alexandre Julliard : gphoto.ds: Make some functions and variables static.
Alexandre Julliard
julliard at winehq.org
Tue Dec 2 11:02:02 CST 2008
Module: wine
Branch: master
Commit: 4c2a2111272bcac0e460c3dde456a72e6911c4f7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c2a2111272bcac0e460c3dde456a72e6911c4f7
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Dec 2 15:25:39 2008 +0100
gphoto.ds: Make some functions and variables static.
---
dlls/gphoto2.ds/gphoto2_i.h | 10 ----------
dlls/gphoto2.ds/gphoto2_main.c | 2 +-
dlls/gphoto2.ds/ui.c | 4 ++--
3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h
index 89c4bc0..8312815 100644
--- a/dlls/gphoto2.ds/gphoto2_i.h
+++ b/dlls/gphoto2.ds/gphoto2_i.h
@@ -103,16 +103,6 @@ struct tagActiveDS
/* Helper functions */
extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action);
-/* */
-extern TW_UINT16 GPHOTO2_ControlGroupHandler (
- pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
-extern TW_UINT16 GPHOTO2_ImageGroupHandler (
- pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
-extern TW_UINT16 GPHOTO2_AudioGroupHandler (
- pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
-extern TW_UINT16 GPHOTO2_SourceManagerHandler (
- pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG, TW_MEMREF pData);
-
/* Implementation of operation triplets
* From Application to Source (Control Information) */
TW_UINT16 GPHOTO2_CapabilityGet (pTW_IDENTITY pOrigin, TW_MEMREF pData);
diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
index f4f4546..c023828 100644
--- a/dlls/gphoto2.ds/gphoto2_main.c
+++ b/dlls/gphoto2.ds/gphoto2_main.c
@@ -311,7 +311,7 @@ static TW_UINT16 GPHOTO2_SourceControlHandler (
}
-TW_UINT16 GPHOTO2_ImageGroupHandler (
+static TW_UINT16 GPHOTO2_ImageGroupHandler (
pTW_IDENTITY pOrigin,
TW_UINT16 DAT,
TW_UINT16 MSG,
diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c
index e9d2f87..40afb9e 100644
--- a/dlls/gphoto2.ds/ui.c
+++ b/dlls/gphoto2.ds/ui.c
@@ -39,8 +39,8 @@
#include "wine/debug.h"
#include "resource.h"
-LPCSTR settings_key = "Software\\Wine\\Gphoto2";
-LPCSTR settings_value = "SkipUI";
+static const char settings_key[] = "Software\\Wine\\Gphoto2";
+static const char settings_value[] = "SkipUI";
static BOOL disable_dialog;
static HBITMAP static_bitmap;
More information about the wine-cvs
mailing list