diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-05 10:11:47 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-06 20:30:34 +0100 |
commit | 1222609fc5d9c980c1da9fb839f86455047c7c91 (patch) | |
tree | 745775fe5729f7cfa13dc99f9ff085f7aa52caca /libmsi/storages.c | |
parent | 175346aac4942eb97ccf2f00ca127cf700cd2eff (diff) | |
download | msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.tar.gz msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.tar.xz msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.zip |
eliminate WCHAR
Diffstat (limited to 'libmsi/storages.c')
-rw-r--r-- | libmsi/storages.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libmsi/storages.c b/libmsi/storages.c index 314ddf5..776ce7d 100644 --- a/libmsi/storages.c +++ b/libmsi/storages.c @@ -65,7 +65,7 @@ static bool storages_set_table_size(LibmsiStorageView *sv, unsigned size) return true; } -static STORAGE *create_storage(LibmsiStorageView *sv, const WCHAR *name) +static STORAGE *create_storage(LibmsiStorageView *sv, const char *name) { STORAGE *storage; @@ -120,7 +120,7 @@ static unsigned storages_view_set_row(LibmsiView *view, unsigned row, LibmsiReco { LibmsiStorageView *sv = (LibmsiStorageView *)view; GsfInput *stm; - WCHAR *name = NULL; + char *name = NULL; unsigned r = LIBMSI_RESULT_FUNCTION_FAILED; TRACE("(%p, %p)\n", view, rec); @@ -132,7 +132,7 @@ static unsigned storages_view_set_row(LibmsiView *view, unsigned row, LibmsiReco if (r != LIBMSI_RESULT_SUCCESS) return r; - name = strdupW(_libmsi_record_get_string_raw(rec, 1)); + name = strdup(_libmsi_record_get_string_raw(rec, 1)); if (!name) { r = LIBMSI_RESULT_OUTOFMEMORY; @@ -169,7 +169,7 @@ static unsigned storages_view_insert_row(LibmsiView *view, LibmsiRecord *rec, un static unsigned storages_view_delete_row(LibmsiView *view, unsigned row) { LibmsiStorageView *sv = (LibmsiStorageView *)view; - const WCHAR *name; + const char *name; unsigned i; if (row > sv->num_rows) @@ -218,8 +218,8 @@ static unsigned storages_view_get_dimensions(LibmsiView *view, unsigned *rows, u return LIBMSI_RESULT_SUCCESS; } -static unsigned storages_view_get_column_info( LibmsiView *view, unsigned n, const WCHAR **name, - unsigned *type, bool *temporary, const WCHAR **table_name ) +static unsigned storages_view_get_column_info( LibmsiView *view, unsigned n, const char **name, + unsigned *type, bool *temporary, const char **table_name ) { TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); @@ -312,7 +312,7 @@ static const LibmsiViewOps storages_ops = NULL, }; -static unsigned add_storage_to_table(const WCHAR *name, GsfInfile *stg, void *opaque) +static unsigned add_storage_to_table(const char *name, GsfInfile *stg, void *opaque) { LibmsiStorageView *sv = (LibmsiStorageView *)opaque; STORAGE *storage; |