[884] in BarnOwl Developers
[D-O-H] r871 - branches/barnowl_sqlite/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:10:45 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 14 Jan 2008 17:41:55 -0500 (EST)
Author: nelhage
Date: 2008-01-14 17:41:55 -0500 (Mon, 14 Jan 2008)
New Revision: 871
Modified:
branches/barnowl_sqlite/owl/messagelist.c
branches/barnowl_sqlite/owl/view.c
Log:
Convert some more undefs to NULLs
Modified: branches/barnowl_sqlite/owl/messagelist.c
===================================================================
--- branches/barnowl_sqlite/owl/messagelist.c 2008-01-14 22:39:47 UTC (rev 870)
+++ branches/barnowl_sqlite/owl/messagelist.c 2008-01-14 22:41:55 UTC (rev 871)
@@ -42,8 +42,7 @@
msg = POPs;
if(SvROK(msg)) SvREFCNT_inc(msg);
);
- if(SvROK(msg)) return msg;
- return NULL;
+ return SvROK(msg) ? msg : NULL;
}
owl_message *owl_messagelist_get_by_id(owl_messagelist *ml, int target_id)
@@ -55,9 +54,9 @@
"Error in get_by_id: %s",
1, //Fatal errors
msg = POPs;
- SvREFCNT_inc(msg);
+ if(SvROK(msg)) SvREFCNT_inc(msg);
);
- return msg;
+ return SvROK(msg) ? msg : NULL;
}
void owl_messagelist_append_element(owl_messagelist *ml, void *element)
Modified: branches/barnowl_sqlite/owl/view.c
===================================================================
--- branches/barnowl_sqlite/owl/view.c 2008-01-14 22:39:47 UTC (rev 870)
+++ branches/barnowl_sqlite/owl/view.c 2008-01-14 22:41:55 UTC (rev 871)
@@ -73,6 +73,8 @@
owl_message *owl_view_get_element(owl_view *v, int index)
{
+ if(index < 0 || index >= owl_view_get_size(v))
+ return NULL;
int id = (int)owl_list_get_element(&(v->messages), index);
return owl_messagelist_get_by_id(owl_global_get_msglist(&g), id);
}
