kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

correct use of nonull attribute

Browse Source
This commit is contained in:
Campbell Barton 2012-07-08 17:08:27 +00:00
parent 4c6abb8105
commit 0c7b56cf39
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/BKE_idprop.h
View File

@ -77,6 +77,9 @@ void IDP_FreeIDPArray(IDProperty *prop);
/* shallow copies item */
void IDP_SetIndexArray(struct IDProperty *prop, int index, struct IDProperty *item);
#ifdef __GNUC__
__attribute__((nonnull))
#endif
struct IDProperty *IDP_GetIndexArray(struct IDProperty *prop, int index)
#ifdef __GNUC__
__attribute__((warn_unused_result))
@ -95,7 +98,7 @@ void IDP_FreeArray(struct IDProperty *prop);
IDProperty *IDP_NewString(const char *st, const char *name, int maxlen) /* maxlen excludes '\0' */
#ifdef __GNUC__
__attribute__((warn_unused_result))
__attribute__((nonnull))
__attribute__((nonnull (2))) /* 'name' arg */
#endif
;
@ -260,7 +263,6 @@ __attribute__((nonnull))
int IDP_EqualsProperties(struct IDProperty *prop1, struct IDProperty *prop2)
#ifdef __GNUC__
__attribute__((warn_unused_result))
__attribute__((nonnull))
#endif
;

4
source/blender/blenkernel/intern/idprop.c
View File

@ -604,7 +604,9 @@ IDProperty *IDP_CopyProperty(IDProperty *prop)
IDProperty *IDP_GetProperties(ID *id, int create_if_needed)
{
if (id->properties) return id->properties;
if (id->properties) {
return id->properties;
}
else {
if (create_if_needed) {
id->properties = MEM_callocN(sizeof(IDProperty), "IDProperty");