diff options
| author | Tim Potter <tpot@samba.org> | 2004-04-28 07:32:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:51:36 -0500 |
| commit | b0b97592be312b3553ac31cc3f3cb994de06e506 (patch) | |
| tree | dc9d731c916eae81767883804c2d7d269bc56f3f /source4/lib/ldb/common | |
| parent | 6411aa483f9233af098b4893ad67ebd2fd9d5868 (diff) | |
| download | samba-b0b97592be312b3553ac31cc3f3cb994de06e506.tar.gz samba-b0b97592be312b3553ac31cc3f3cb994de06e506.tar.bz2 samba-b0b97592be312b3553ac31cc3f3cb994de06e506.zip | |
r382: More C++ friendliness fixes.
(This used to be commit e96f3a2005cf6f4da2ecd4670a35eab1b4f250d0)
Diffstat (limited to 'source4/lib/ldb/common')
| -rw-r--r-- | source4/lib/ldb/common/ldb_ldif.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/ldb/common/ldb_ldif.c b/source4/lib/ldb/common/ldb_ldif.c index 5f2fccfebc..2eaee28eb6 100644 --- a/source4/lib/ldb/common/ldb_ldif.c +++ b/source4/lib/ldb/common/ldb_ldif.c @@ -410,7 +410,7 @@ void ldif_read_free(struct ldb_ldif *ldif) if (msg->elements[i].values) free(msg->elements[i].values); } if (msg->elements) free(msg->elements); - if (msg->private) free(msg->private); + if (msg->private_data) free(msg->private_data); free(ldif); } @@ -444,7 +444,7 @@ static int msg_add_empty(struct ldb_message *msg, const char *name, unsigned fla /* read from a LDIF source, creating a ldb_message */ -struct ldb_ldif *ldif_read(int (*fgetc_fn)(void *), void *private) +struct ldb_ldif *ldif_read(int (*fgetc_fn)(void *), void *private_data) { struct ldb_ldif *ldif; struct ldb_message *msg; @@ -463,14 +463,14 @@ struct ldb_ldif *ldif_read(int (*fgetc_fn)(void *), void *private) msg->dn = NULL; msg->elements = NULL; msg->num_elements = 0; - msg->private = NULL; + msg->private_data = NULL; - chunk = next_chunk(fgetc_fn, private); + chunk = next_chunk(fgetc_fn, private_data); if (!chunk) { goto failed; } - msg->private = chunk; + msg->private_data = chunk; s = chunk; if (next_attr(&s, &attr, &value) != 0) { |