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/query.h | |
parent | 175346aac4942eb97ccf2f00ca127cf700cd2eff (diff) | |
download | msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.tar.gz msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.tar.xz msitools-1222609fc5d9c980c1da9fb839f86455047c7c91.zip |
eliminate WCHAR
Diffstat (limited to 'libmsi/query.h')
-rw-r--r-- | libmsi/query.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libmsi/query.h b/libmsi/query.h index 48e4ebc..d2c569f 100644 --- a/libmsi/query.h +++ b/libmsi/query.h @@ -58,7 +58,7 @@ #define EXPR_UNARY 12 struct sql_str { - const WCHAR *data; + const char *data; int len; }; @@ -74,8 +74,8 @@ union ext_column { struct { - const WCHAR *column; - const WCHAR *table; + const char *column; + const char *table; } unparsed; struct { @@ -92,15 +92,15 @@ struct expr struct complex_expr expr; int ival; unsigned uval; - const WCHAR *sval; + const char *sval; union ext_column column; } u; }; -unsigned _libmsi_parse_sql( LibmsiDatabase *db, const WCHAR *command, LibmsiView **phview, +unsigned _libmsi_parse_sql( LibmsiDatabase *db, const char *command, LibmsiView **phview, struct list *mem ); -unsigned table_view_create( LibmsiDatabase *db, const WCHAR *name, LibmsiView **view ); +unsigned table_view_create( LibmsiDatabase *db, const char *name, LibmsiView **view ); unsigned select_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView *table, const column_info *columns ); @@ -110,33 +110,33 @@ unsigned distinct_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView unsigned order_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView *table, column_info *columns ); -unsigned where_view_create( LibmsiDatabase *db, LibmsiView **view, WCHAR *tables, +unsigned where_view_create( LibmsiDatabase *db, LibmsiView **view, char *tables, struct expr *cond ); -unsigned create_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR *table, +unsigned create_view_create( LibmsiDatabase *db, LibmsiView **view, const char *table, column_info *col_info, bool hold ); -unsigned insert_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR *table, +unsigned insert_view_create( LibmsiDatabase *db, LibmsiView **view, const char *table, column_info *columns, column_info *values, bool temp ); -unsigned update_view_create( LibmsiDatabase *db, LibmsiView **view, WCHAR *table, +unsigned update_view_create( LibmsiDatabase *db, LibmsiView **view, char *table, column_info *list, struct expr *expr ); unsigned delete_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView *table ); -unsigned alter_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR *name, column_info *colinfo, int hold ); +unsigned alter_view_create( LibmsiDatabase *db, LibmsiView **view, const char *name, column_info *colinfo, int hold ); unsigned streams_view_create( LibmsiDatabase *db, LibmsiView **view ); unsigned storages_view_create( LibmsiDatabase *db, LibmsiView **view ); -unsigned drop_view_create( LibmsiDatabase *db, LibmsiView **view, const WCHAR *name ); +unsigned drop_view_create( LibmsiDatabase *db, LibmsiView **view, const char *name ); -int sql_get_token(const WCHAR *z, int *tokenType, int *skip); +int sql_get_token(const char *z, int *tokenType, int *skip); LibmsiRecord *msi_query_merge_record( unsigned fields, const column_info *vl, LibmsiRecord *rec ); -unsigned msi_create_table( LibmsiDatabase *db, const WCHAR *name, column_info *col_info, +unsigned msi_create_table( LibmsiDatabase *db, const char *name, column_info *col_info, LibmsiCondition persistent ); #pragma GCC visibility pop |