static LttvBdevState *bdevstate_copy(LttvBdevState *bds);
-#if (__SIZEOF_LONG__ == 4)
+#if (__WORDSIZE == 32)
guint guint64_hash(gconstpointer key)
{
guint64 ukey = *(const guint64 *)key;
static void expand_kprobe_table(LttvTraceState *ts, guint64 ip, char *symbol)
{
LttvNameTables *nt = ts->name_tables;
-#if (__SIZEOF_LONG__ == 4)
+#if (__WORDSIZE == 32)
guint64 *ip_ptr = g_new(guint64, 1);
g_hash_table_insert(nt->kprobe_hash, ip_ptr,
(gpointer)(glong)g_quark_from_string(symbol));
LttEventPosition *ep;
LttvTracesetContext *tsc = self->parent.ts_context;
+ int retval;
tracefiles_tree = lttv_attribute_find_subdir(container,
LTTV_STATE_TRACEFILES);
g_tree_remove(tsc->pqueue, tfc);
if(ep != NULL) {
- g_assert(ltt_tracefile_seek_position(tfc->tf, ep) == 0);
+ retval= ltt_tracefile_seek_position(tfc->tf, ep);
+ g_assert_cmpint(retval, ==, 0);
tfc->timestamp = ltt_event_time(ltt_tracefile_get_event(tfc->tf));
- g_assert(ltt_time_compare(tfc->timestamp, ltt_time_infinite) != 0);
+ g_assert_cmpint(ltt_time_compare(tfc->timestamp, ltt_time_infinite), !=, 0);
g_tree_insert(tsc->pqueue, tfc, tfc);
g_info("Restoring state for a tf at time %lu.%lu", tfc->timestamp.tv_sec, tfc->timestamp.tv_nsec);
} else {
g_string_free(fe_name, TRUE);
-#if (__SIZEOF_LONG__ == 4)
+#if (__WORDSIZE == 32)
name_tables->kprobe_hash = g_hash_table_new_full(guint64_hash, guint64_equal,
g_free, NULL);
#else