Author: idra Date: 2006-08-27 23:32:14 +0000 (Sun, 27 Aug 2006) New Revision: 17859
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17859 Log: Fix some return values Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c 2006-08-27 20:41:29 UTC (rev 17858) +++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c 2006-08-27 23:32:14 UTC (rev 17859) @@ -124,14 +124,14 @@ struct ldb_message_element *els; if (! ldb_valid_attr_name(attr_name)) { - return -1; + return LDB_ERR_OPERATIONS_ERROR; } els = talloc_realloc(msg, msg->elements, struct ldb_message_element, msg->num_elements+1); if (!els) { errno = ENOMEM; - return -1; + return LDB_ERR_OPERATIONS_ERROR; } els[msg->num_elements].values = NULL; @@ -140,13 +140,13 @@ els[msg->num_elements].name = talloc_strdup(els, attr_name); if (!els[msg->num_elements].name) { errno = ENOMEM; - return -1; + return LDB_ERR_OPERATIONS_ERROR; } msg->elements = els; msg->num_elements++; - return 0; + return LDB_SUCCESS; } /* @@ -157,13 +157,13 @@ int flags) { if (ldb_msg_add_empty(msg, el->name, flags) != 0) { - return -1; + return LDB_ERR_OPERATIONS_ERROR; } msg->elements[msg->num_elements-1] = *el; msg->elements[msg->num_elements-1].flags = flags; - return 0; + return LDB_SUCCESS; } /* @@ -182,19 +182,19 @@ el = ldb_msg_find_element(msg, attr_name); } if (!el) { - return -1; + return LDB_ERR_OPERATIONS_ERROR; } vals = talloc_realloc(msg, el->values, struct ldb_val, el->num_values+1); if (!vals) { errno = ENOMEM; - return -1; + return LDB_ERR_OPERATIONS_ERROR; } el->values = vals; el->values[el->num_values] = *val; el->num_values++; - return 0; + return LDB_SUCCESS; } @@ -258,7 +258,7 @@ str = talloc_vasprintf(msg, fmt, ap); va_end(ap); - if (str == NULL) return -1; + if (str == NULL) return LDB_ERR_OPERATIONS_ERROR; val.data = (uint8_t *)str; val.length = strlen(str); @@ -684,13 +684,13 @@ { struct ldb_message_element *el = ldb_msg_find_element(msg, attr); if (el == NULL) { - return 0; + return LDB_SUCCESS; } el->name = talloc_strdup(msg->elements, replace); if (el->name == NULL) { - return -1; + return LDB_ERR_OPERATIONS_ERROR; } - return 0; + return LDB_SUCCESS; } @@ -701,10 +701,10 @@ { struct ldb_message_element *el = ldb_msg_find_element(msg, attr); if (el == NULL) { - return 0; + return LDB_SUCCESS; } if (ldb_msg_add(msg, el, 0) != 0) { - return -1; + return LDB_ERR_OPERATIONS_ERROR; } return ldb_msg_rename_attr(msg, attr, replace); }