diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-23 11:25:34 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-06 20:26:29 +0100 |
| commit | 30557984c4dac095c98ba7ba25afa6948d6f9934 (patch) | |
| tree | 4e490c92fbeb44efef0e53fbbe10f938e7822425 /libmsi/database.c | |
| parent | b19defc32740225273c7efa63a784de18cde3dd1 (diff) | |
| download | msitools-30557984c4dac095c98ba7ba25afa6948d6f9934.tar.gz msitools-30557984c4dac095c98ba7ba25afa6948d6f9934.tar.xz msitools-30557984c4dac095c98ba7ba25afa6948d6f9934.zip | |
get rid of the stupid Win32 CHAR type
Diffstat (limited to 'libmsi/database.c')
| -rw-r--r-- | libmsi/database.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmsi/database.c b/libmsi/database.c index efdfe52..e51a081 100644 --- a/libmsi/database.c +++ b/libmsi/database.c @@ -466,7 +466,7 @@ unsigned MsiOpenDatabaseW(const WCHAR *szDBPath, const WCHAR *szPersist, MSIOBJE return ret; } -unsigned MsiOpenDatabaseA(const CHAR *szDBPath, const CHAR *szPersist, MSIOBJECT **phDB) +unsigned MsiOpenDatabaseA(const char *szDBPath, const char *szPersist, MSIOBJECT **phDB) { HRESULT r = ERROR_FUNCTION_FAILED; WCHAR *szwDBPath = NULL; @@ -503,7 +503,7 @@ end: static WCHAR *msi_read_text_archive(const WCHAR *path, unsigned *len) { HANDLE file; - CHAR *data = NULL; + char *data = NULL; WCHAR *wdata = NULL; unsigned read, size = 0; @@ -1042,7 +1042,7 @@ unsigned MsiDatabaseImportW(MSIOBJECT *handle, const WCHAR *szFolder, const WCHA } unsigned MsiDatabaseImportA( MSIOBJECT *handle, - const CHAR *szFolder, const CHAR *szFilename ) + const char *szFolder, const char *szFilename ) { WCHAR *path = NULL; WCHAR *file = NULL; @@ -1251,8 +1251,8 @@ unsigned MsiDatabaseExportW( MSIOBJECT *handle, const WCHAR *szTable, return r; } -unsigned MsiDatabaseExportA( MSIOBJECT *handle, const CHAR *szTable, - const CHAR *szFolder, const CHAR *szFilename ) +unsigned MsiDatabaseExportA( MSIOBJECT *handle, const char *szTable, + const char *szFolder, const char *szFilename ) { WCHAR *path = NULL; WCHAR *file = NULL; @@ -1294,7 +1294,7 @@ end: } unsigned MsiDatabaseMergeA(MSIOBJECT *hDatabase, MSIOBJECT *hDatabaseMerge, - const CHAR *szTableName) + const char *szTableName) { unsigned r; WCHAR *table; |