[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56695] trunk/blender: correct assert for driver evaluation,
Campbell Barton
ideasman42 at gmail.com
Sun May 12 07:54:34 CEST 2013
Revision: 56695
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56695
Author: campbellbarton
Date: 2013-05-12 05:54:33 +0000 (Sun, 12 May 2013)
Log Message:
-----------
correct assert for driver evaluation,
also add asserts for listbase functions when the list is NULL, and use noreturn attribute for jpeg_error.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenlib/intern/listbase.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
Modified: trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2013-05-12 04:08:45 UTC (rev 56694)
+++ trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2013-05-12 05:54:33 UTC (rev 56695)
@@ -84,10 +84,12 @@
*/
short MEM_freeN(void *vmemh);
+#if 0 /* UNUSED */
/**
* Return zero if memory is not in allocated list
*/
short MEM_testN(void *vmemh);
+#endif
/**
* Duplicates a block of memory, and returns a pointer to the
Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c 2013-05-12 04:08:45 UTC (rev 56694)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c 2013-05-12 05:54:33 UTC (rev 56695)
@@ -1248,7 +1248,7 @@
float tmp_loc[3];
/* after the checks above, the targets should be valid here... */
- BLI_assert((ob != NULL) && (GS(ob->id.name) != ID_OB));
+ BLI_assert((ob != NULL) && (GS(ob->id.name) == ID_OB));
/* try to get posechannel */
pchan = BKE_pose_channel_find_name(ob->pose, dtar->pchan_name);
Modified: trunk/blender/source/blender/blenlib/intern/listbase.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/listbase.c 2013-05-12 04:08:45 UTC (rev 56694)
+++ trunk/blender/source/blender/blenlib/intern/listbase.c 2013-05-12 05:54:33 UTC (rev 56695)
@@ -71,6 +71,7 @@
Link *link = vlink;
if (link == NULL) return;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return;
link->next = listbase->first;
@@ -90,6 +91,7 @@
Link *link = vlink;
if (link == NULL) return;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return;
link->next = NULL;
@@ -109,6 +111,7 @@
Link *link = vlink;
if (link == NULL) return;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return;
if (link->next) link->next->prev = link->prev;
@@ -141,6 +144,7 @@
Link *link = vlink;
if (link == NULL) return;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return;
BLI_remlink(listbase, link);
@@ -160,6 +164,7 @@
Link *next = NULL;
if (cmp == NULL) return;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return;
if (listbase->first != listbase->last) {
@@ -189,6 +194,7 @@
/* newlink before nextlink */
if (newlink == NULL) return;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return;
/* empty list */
@@ -231,6 +237,7 @@
/* newlink before nextlink */
if (newlink == NULL) return;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return;
/* empty list */
@@ -270,6 +277,7 @@
{
Link *link, *next;
+ BLI_assert(listbase != NULL);
if (listbase == NULL)
return;
@@ -291,6 +299,7 @@
{
Link *link, *next;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return;
link = listbase->first;
@@ -367,6 +376,7 @@
Link *link = NULL;
int number = 0;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return -1;
if (vlink == NULL) return -1;
@@ -391,6 +401,7 @@
Link *link = NULL;
const char *id_iter;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return NULL;
for (link = listbase->first; link; link = link->next) {
@@ -413,6 +424,7 @@
Link *link = NULL;
const char *id_iter;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return NULL;
for (link = listbase->last; link; link = link->prev) {
@@ -435,6 +447,7 @@
Link *link = NULL;
const char *id_iter;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return NULL;
for (link = listbase->first; link; link = link->next) {
@@ -458,6 +471,7 @@
Link *link = NULL;
const char *id_iter;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return NULL;
for (link = listbase->last; link; link = link->prev) {
@@ -481,6 +495,7 @@
Link *link = NULL;
const void *ptr_iter;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return NULL;
for (link = listbase->first; link; link = link->next) {
@@ -504,6 +519,7 @@
Link *link = NULL;
const void *ptr_iter;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return NULL;
for (link = listbase->last; link; link = link->prev) {
@@ -528,6 +544,7 @@
const char *id_iter;
int i = 0;
+ BLI_assert(listbase != NULL);
if (listbase == NULL) return -1;
link = listbase->first;
@@ -607,7 +624,7 @@
return NULL;
/* create new link, and make it hold the given data */
- ld = MEM_callocN(sizeof(LinkData), "BLI_genericNodeN()");
+ ld = MEM_callocN(sizeof(LinkData), __func__);
ld->data = data;
return ld;
Modified: trunk/blender/source/blender/imbuf/intern/jpeg.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jpeg.c 2013-05-12 04:08:45 UTC (rev 56694)
+++ trunk/blender/source/blender/imbuf/intern/jpeg.c 2013-05-12 05:54:33 UTC (rev 56695)
@@ -59,7 +59,11 @@
#define IS_maxjpg(x) ((x->ftype & JPG_MSK) == JPG_MAX)
/* the types are from the jpeg lib */
-static void jpeg_error(j_common_ptr cinfo);
+static void jpeg_error(j_common_ptr cinfo)
+#ifdef __GNUC__
+__attribute__((noreturn));
+#endif
+;
static void init_source(j_decompress_ptr cinfo);
static boolean fill_input_buffer(j_decompress_ptr cinfo);
static void skip_input_data(j_decompress_ptr cinfo, long num_bytes);
More information about the Bf-blender-cvs
mailing list