diff options
author | DuClare <akarinotengoku@gmail.com> | 2009-05-15 20:41:00 +0300 |
---|---|---|
committer | DuClare <akarinotengoku@gmail.com> | 2009-05-15 20:41:00 +0300 |
commit | ba6aeb5e28193dbfa74aec98be6c6ddbaf3cc5f6 (patch) | |
tree | b9fa11b94b2aa6cb302c6c04e4c84e983940aee8 /uzbl.c | |
parent | 4293a258255849854670ce12de428581904a1a24 (diff) |
Revert "Fix warnings caused by casts between ints and pointers on 64bit"
This reverts commit 4293a258255849854670ce12de428581904a1a24.
The fix had introduced regressions on 32bit :<
Diffstat (limited to 'uzbl.c')
-rw-r--r-- | uzbl.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -107,7 +107,7 @@ const struct { { "SUPER", GDK_SUPER_MASK }, // super (since 2.10) { "HYPER", GDK_HYPER_MASK }, // hyper (since 2.10) { "META", GDK_META_MASK }, // meta (since 2.10) - { NULL, 0 } + { NULL, NULL } }; /* construct a hash from the var_name_to_ptr array for quick access */ @@ -579,7 +579,8 @@ setup_scanner() { uzbl.scan = g_scanner_new(&scan_config); while(symp->symbol_name) { g_scanner_scope_add_symbol(uzbl.scan, 0, - symp->symbol_name, (gulong*)&(symp->symbol_token)); + symp->symbol_name, + GINT_TO_POINTER(symp->symbol_token)); symp++; } } @@ -591,14 +592,14 @@ expand_template(const char *template) { GTokenType token = G_TOKEN_NONE; GString *ret = g_string_new(""); char *buf=NULL; - gulong sym; + int sym; g_scanner_input_text(uzbl.scan, template, strlen(template)); while(!g_scanner_eof(uzbl.scan) && token != G_TOKEN_LAST) { token = g_scanner_get_next_token(uzbl.scan); if(token == G_TOKEN_SYMBOL) { - sym = *((gulong*)g_scanner_cur_value(uzbl.scan).v_int); + sym = (int)g_scanner_cur_value(uzbl.scan).v_symbol; switch(sym) { case SYM_URI: g_string_append(ret, @@ -773,12 +774,12 @@ setup_regex() { static gboolean get_var_value(gchar *name) { void **p = NULL; - + if( (p = g_hash_table_lookup(uzbl.comm.proto_var, name)) ) { if(var_is("status_format", name) || var_is("useragent", name)) { printf("VAR: %s VALUE: %s\n", name, (char *)*p); - } else printf("VAR: %s VALUE: %d\n", name, *((int *)p)); + } else printf("VAR: %s VALUE: %d\n", name, (int)*p); } return TRUE; } |