diff options
| author | Kamen Mazdrashki <kamen.mazdrashki@postpath.com> | 2009-10-29 18:18:54 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-11-06 14:05:50 +0100 |
| commit | 0f531e3a2a94594ad5a68bbf8bae85555b8f644e (patch) | |
| tree | ef01f2f6355efd8b6ede56c8e96c59141b34f85a /source4/dsdb | |
| parent | c236bb537f1ee8c287c9dbbbc1cbe47fabbeb688 (diff) | |
| download | samba-0f531e3a2a94594ad5a68bbf8bae85555b8f644e.tar.gz samba-0f531e3a2a94594ad5a68bbf8bae85555b8f644e.tar.bz2 samba-0f531e3a2a94594ad5a68bbf8bae85555b8f644e.zip | |
s4/drs: Refactor to be more SAMBA.Coding style compliant
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/schema/schema_init.c | 3 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_prefixmap.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c index 262ac098df..de370e0b23 100644 --- a/source4/dsdb/schema/schema_init.c +++ b/source4/dsdb/schema/schema_init.c @@ -174,7 +174,8 @@ WERROR dsdb_get_oid_mappings_ldb(const struct dsdb_schema *schema, pfm.reserved = 0; pfm.ctr.dsdb = *ctr; - ndr_err = ndr_push_struct_blob(prefixMap, mem_ctx, schema->iconv_convenience, &pfm, (ndr_push_flags_fn_t)ndr_push_prefixMapBlob); + ndr_err = ndr_push_struct_blob(prefixMap, mem_ctx, schema->iconv_convenience, &pfm, + (ndr_push_flags_fn_t)ndr_push_prefixMapBlob); talloc_free(ctr); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { NTSTATUS nt_status = ndr_map_error2ntstatus(ndr_err); diff --git a/source4/dsdb/schema/schema_prefixmap.c b/source4/dsdb/schema/schema_prefixmap.c index acdb034a9b..969b357a39 100644 --- a/source4/dsdb/schema/schema_prefixmap.c +++ b/source4/dsdb/schema/schema_prefixmap.c @@ -120,9 +120,7 @@ static WERROR _dsdb_schema_pfm_add_entry(struct dsdb_schema_prefixmap *pfm, DATA /* dup memory for bin-oid prefix to be added */ bin_oid = data_blob_dup_talloc(pfm, &bin_oid); - if (!bin_oid.data) { - return WERR_NOMEM; - } + W_ERROR_HAVE_NO_MEMORY(bin_oid.data); /* make room for new entry */ prefixes_new = talloc_realloc(pfm, pfm->prefixes, struct dsdb_schema_prefixmap_oid, pfm->length + 1); |