libgaim/protocols/zephyr/ZGetSubs.c@f3d13f21350c
libgaim/protocols/zephyr/ZGetSubs.c
Tue, 26 Sep 2006 17:38:09 +0000
- author
- Richard Laager <rlaager@pidgin.im>
- date
- Tue, 26 Sep 2006 17:38:09 +0000
- changeset 14686
- f3d13f21350c
- parent 14254
- 77edc7a6191a
- child 20470
- 77693555855f
- permissions
- -rw-r--r--
[gaim-migrate @ 17356]
After the comments on gaim-devel about 'bad' code, I looked into the function referenced. It appears that yahoo_buddy_icon_upload_connected() is only called as a callback. It's registered from yahoo_buddy_icon_upload(). yahoo_buddy_icon_upload() is only called twice. In neither case can a NULL make it down to yahoo_buddy_icon_upload_connected(). As this is an exceptional case rather than a normal one, a g_return_if_fail() is more appropriate. That adds logging, makes the intent clearer, and will help the Coverity software detect violations of this assumption.
/* This file is part of the Project Athena Zephyr Notification System. * It contains source for the ZGetSubscriptions function. * * Created by: Robert French * * Copyright (c) 1987 by the Massachusetts Institute of Technology. * For copying and distribution information, see the file * "mit-copyright.h". */ #include "internal.h" #define min(a,b) ((a)<(b)?(a):(b)) /* Prototype for -Wmissing-prototypes */ Code_t ZGetSubscriptions(ZSubscription_t *subscription, int *numsubs); Code_t ZGetSubscriptions(ZSubscription_t *subscription, int *numsubs) { int i; if (!__subscriptions_list) return (ZERR_NOSUBSCRIPTIONS); if (__subscriptions_next == __subscriptions_num) return (ZERR_NOMORESUBSCRIPTIONS); for (i=0;i<min(*numsubs, __subscriptions_num-__subscriptions_next);i++) subscription[i] = __subscriptions_list[i+__subscriptions_next]; if (__subscriptions_num-__subscriptions_next < *numsubs) *numsubs = __subscriptions_num-__subscriptions_next; __subscriptions_next += *numsubs; return (ZERR_NONE); }
