← Back to branch summary

~apachelogger/+junk/plymouth-stop-kdm

« back to all changes in this revision

Viewing changes to src/plugins/splash/script/script-object.c

  • Committer: Scott James Remnant
  • Date: 2010-03-25 16:44:25 UTC
  • mfrom: (1016.2.1 upstream)
  • Revision ID: scott@netsplit.com-20100325164425-daotztzazohftmt4
Merge upstream 0.8.1 release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/splash/script/script-object.c
314
314
    }
315
315
  if (script_obj_is_null (obj))
316
316
    return strdup("#NULL");
317
 
  asprintf (&reply, "#(0x%x)", (int) obj);
 
317
  asprintf (&reply, "#(0x%p)", obj);
318
318
  return reply;
319
319
}
320
320
 
409
409
  if (obj->type == SCRIPT_OBJ_TYPE_HASH)
410
410
    {
411
411
      script_variable_t *variable = ply_hashtable_lookup (obj->data.hash, (void *) name);
412
 
      if (!variable) return NULL;
413
 
      return variable->object;
 
412
      if (variable)
 
413
        return variable->object;
414
414
    }
415
415
  return NULL;
416
416
}