Tue, 26 Sep 2006 17:38:09 +0000
[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.
| 2086 | 1 | /* This file is part of the Project Athena Zephyr Notification System. |
| 2 | * It contains source for the ZGetLocations function. | |
| 3 | * | |
| 4 | * Created by: Robert French | |
| 5 | * | |
| 6 | * Copyright (c) 1987 by the Massachusetts Institute of Technology. | |
| 7 | * For copying and distribution information, see the file | |
| 8 | * "mit-copyright.h". | |
| 9 | */ | |
| 10 | ||
|
8792
b0645c9dc276
[gaim-migrate @ 9554]
Christian Hammond <chipx86@chipx86.com>
parents:
2086
diff
changeset
|
11 | #include "internal.h" |
| 2086 | 12 | |
| 13 | #define min(a,b) ((a)<(b)?(a):(b)) | |
|
12424
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
11105
diff
changeset
|
14 | |
|
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
11105
diff
changeset
|
15 | /* Prototype for -Wmissing-prototypes */ |
|
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
11105
diff
changeset
|
16 | Code_t ZGetLocations(ZLocations_t *location, int *numlocs); |
|
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
11105
diff
changeset
|
17 | |
|
af82a40f2488
[gaim-migrate @ 14731]
Richard Laager <rlaager@pidgin.im>
parents:
11105
diff
changeset
|
18 | Code_t ZGetLocations(ZLocations_t *location, int *numlocs) |
| 2086 | 19 | { |
| 20 | int i; | |
| 21 | ||
| 22 | if (!__locate_list) | |
| 23 | return (ZERR_NOLOCATIONS); | |
| 24 | ||
| 25 | if (__locate_next == __locate_num) | |
| 26 | return (ZERR_NOMORELOCS); | |
| 27 | ||
| 28 | for (i=0;i<min(*numlocs, __locate_num-__locate_next);i++) | |
| 29 | location[i] = __locate_list[i+__locate_next]; | |
| 30 | ||
| 31 | if (__locate_num-__locate_next < *numlocs) | |
| 32 | *numlocs = __locate_num-__locate_next; | |
| 33 | ||
| 34 | __locate_next += *numlocs; | |
| 35 | ||
| 36 | return (ZERR_NONE); | |
| 37 | } |