Changeset 21717 for branches/gcc-kmk/include

Timestamp:

Oct 18, 2011, 9:16:41 PM (14 years ago)

Author:

dmik

Message:

Use const char * for arguments accepting literal strings.

This is more correct and also clears GCC warnings.

Location:

branches/gcc-kmk/include

Files:

• _ras.h (modified) (5 diffs)
• custombuild.h (modified) (1 diff)
• dbglog.h (modified) (2 diffs)
• win/debugtools.h (modified) (1 diff)
• win/ntdef.h (modified) (3 diffs)
• win32api.h (modified) (1 diff)
• winos2def.h (modified) (4 diffs)

branches/gcc-kmk/include/_ras.h

@@ -45 +45 @@
 
 /* Tracked objects logging functions typedefs */
-typedef void WIN32API FNRASLOG_EXTERNAL (char *fmt, ...);
+typedef void WIN32API FNRASLOG_EXTERNAL (const char *fmt, ...);
 
 typedef ULONG WIN32API FNLOC (ULONG objident, ULONG objhandle, void *objdata, ULONG cbobjdata, FNRASLOG_EXTERNAL *pRasLog);
@@ -62 +62 @@
 void WIN32API RasRegisterObjectTracking (
                   RAS_TRACK_HANDLE *ph,           /* returned handle */
-                  char *objname,                  /* arbitrary distinguishable object name */
+                  const char *objname,            /* arbitrary distinguishable object name */
                   ULONG cbuserdata,               /* extra data size */
                   ULONG flags,                    /* object tracking flags */
@@ -147 +147 @@
 /* RAS logging functions */
 void WIN32API RasLog (
-                  char *fmt,                       /* 'printf' style format string */
+                  const char *fmt,                 /* 'printf' style format string */
                   ...
               );
 
 void WIN32API RasLogNoEOL (
-                  char *fmt,                       /* 'printf' style format string */
+                  const char *fmt,                 /* 'printf' style format string */
                   ...
               );
@@ -244 +244 @@
     ULONG cb;
 
-    void  (* WIN32API RasRegisterObjectTracking) (RAS_TRACK_HANDLE *ph, char *objname, ULONG cbuserdata, ULONG flags, FNLOC *pfnLogObjectContent, FNCOC *pfnCompareObjectContent);
+    void  (* WIN32API RasRegisterObjectTracking) (RAS_TRACK_HANDLE *ph, const char *objname, ULONG cbuserdata, ULONG flags, FNLOC *pfnLogObjectContent, FNCOC *pfnCompareObjectContent);
     void  (* WIN32API RasDeregisterObjectTracking) (RAS_TRACK_HANDLE h);
     ULONG (* WIN32API RasAddObject) (RAS_TRACK_HANDLE h, ULONG objhandle, void *objdata, ULONG cbobjdata);
@@ -302 +302 @@
 #define RasDebugInt3_x(a, b, c) RasBreakPoint(__FILE__, __FUNCTION__, __LINE__, a, b, c)
 
-void __INLINE RasBreakPoint (char *szFile, char *szFunction, int iLine, ULONG msg, ULONG parm1, ULONG parm2)
+void __INLINE RasBreakPoint (const char *szFile, const char *szFunction, int iLine, ULONG msg, ULONG parm1, ULONG parm2)
 {
     RasLog ("BreakPoint at %s(%d)::%s", szFile, iLine, szFunction);

branches/gcc-kmk/include/custombuild.h

@@ -251 +251 @@
 //Override std class names used in Odin
 void  WIN32API SetCustomStdClassName(LPSTR pszStdClassName);
-char *WIN32API QueryCustomStdClassName();
+const char *WIN32API QueryCustomStdClassName();
 
 //Turn off ASPI

branches/gcc-kmk/include/dbglog.h

@@ -78 +78 @@
 
 
-int  SYSTEM WriteLog(char *tekst, ...);
-int  SYSTEM WriteLogNoEOL(char *tekst, ...);
-int  SYSTEM WritePrivateLog(void *logfile, char *tekst, ...);
+int  SYSTEM WriteLog(const char *tekst, ...);
+int  SYSTEM WriteLogNoEOL(const char *tekst, ...);
+int  SYSTEM WritePrivateLog(void *logfile, const char *tekst, ...);
 
 void SYSTEM DecreaseLogCount();
@@ -106 +106 @@
 #define DebugInt3() BreakPoint(__FILE__, __FUNCTION__, __LINE__)
 
-void inline BreakPoint(char *szFile, char *szFunction, int iLine)
+void inline BreakPoint(const char *szFile, const char *szFunction, int iLine)
 {
     dprintf(("BREAKPOINT %s %s %d", szFile, szFunction, iLine));

branches/gcc-kmk/include/win/debugtools.h

@@ -47 +47 @@
 #endif
 
-int  SYSTEM WriteLog(char *tekst, ...);
-int  SYSTEM WritePrivateLog(void *logfile, char *tekst, ...);
+int  SYSTEM WriteLog(const char *tekst, ...);
+int  SYSTEM WritePrivateLog(void *logfile, const char *tekst, ...);
 
 void SYSTEM DecreaseLogCount();

branches/gcc-kmk/include/win/ntdef.h

@@ -9 +9 @@
 #endif
 
-#define NTAPI   __stdcall 
+#define NTAPI   __stdcall
 
 #ifndef IN
@@ -30 +30 @@
 typedef NTSTATUS *PNTSTATUS;
 
+typedef char *PSZ;
 typedef CONST char *PCSZ;
 
 typedef short CSHORT;
-typedef CSHORT *PCSHORT;  
+typedef CSHORT *PCSHORT;
 
 /* NT lowlevel Strings (handled by Rtl* functions in NTDLL)
@@ -73 +74 @@
 #define OBJ_VALID_ATTRIBUTES    0x000003F2L
 
-typedef struct _OBJECT_ATTRIBUTES 
+typedef struct _OBJECT_ATTRIBUTES
 {   ULONG Length;
     HANDLE RootDirectory;

branches/gcc-kmk/include/win32api.h

@@ -41 +41 @@
 LONG   WIN32API RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG);
 LONG   WIN32API RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG);
-LONG   WIN32API RegQueryValueExA(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-LONG   WIN32API RegQueryValueExW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+LONG   WIN32API RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
+LONG   WIN32API RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
 LONG   WIN32API RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
 LONG   WIN32API RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
-LONG   WIN32API RegSetValueExA(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
-LONG   WIN32API RegSetValueExW(HKEY,LPWSTR,DWORD,DWORD,LPBYTE,DWORD);
+LONG   WIN32API RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,LPBYTE,DWORD);
+LONG   WIN32API RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,LPBYTE,DWORD);
 
 DWORD  WIN32API GetModuleFileNameA(HMODULE,LPSTR,DWORD);

branches/gcc-kmk/include/winos2def.h

@@ -31 +31 @@
 #endif
 
-#ifndef PSZ
-#  define PSZ char *
-#endif
+typedef char *PSZ;
+typedef const char *PCSZ;
 
 
@@ -55 +54 @@
 
     return yyrc;
-} 
+}
 
 #undef  WinPostMsg
@@ -69 +68 @@
 
     return yyrc;
-} 
+}
 
 #undef  DosSleep
@@ -116 +115 @@
 
     return yyrc;
-} 
+}
 
 #undef  DosQueryCtryInfo