summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/modules
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-08-17 01:52:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:15:38 -0500
commit9f7da6fea0bc9a330f8620d100e27d4eabbae253 (patch)
tree26967781d0e2481efba0676e27a9a414b62cc703 /source4/lib/ldb/modules
parentc0e60d053598a1d8cd1e3367a38a001ef7c1992a (diff)
downloadsamba-9f7da6fea0bc9a330f8620d100e27d4eabbae253.tar.gz
samba-9f7da6fea0bc9a330f8620d100e27d4eabbae253.tar.bz2
samba-9f7da6fea0bc9a330f8620d100e27d4eabbae253.zip
r17579: make ldb build g++ friendly
(This used to be commit 403cbd335594112e0c58fd68d20f0e3faad7d186)
Diffstat (limited to 'source4/lib/ldb/modules')
-rw-r--r--source4/lib/ldb/modules/paged_results.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index ddaed38fe9..52d26502ee 100644
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -85,41 +85,41 @@ int store_destructor(struct results_store *store)
static struct results_store *new_store(struct private_data *priv)
{
- struct results_store *new;
+ struct results_store *newr;
int new_id = priv->next_free_id++;
/* TODO: we should have a limit on the number of
* outstanding paged searches
*/
- new = talloc(priv, struct results_store);
- if (!new) return NULL;
+ newr = talloc(priv, struct results_store);
+ if (!newr) return NULL;
- new->cookie = talloc_asprintf(new, "%d", new_id);
- if (!new->cookie) {
- talloc_free(new);
+ newr->cookie = talloc_asprintf(newr, "%d", new_id);
+ if (!newr->cookie) {
+ talloc_free(newr);
return NULL;
}
- new->timestamp = time(NULL);
+ newr->timestamp = time(NULL);
- new->num_sent = 0; /* To be removed */
- new->result = NULL; /* To be removed */
+ newr->num_sent = 0; /* To be removed */
+ newr->result = NULL; /* To be removed */
- new->first = NULL;
- new->num_entries = 0;
- new->first_ref = NULL;
- new->controls = NULL;
+ newr->first = NULL;
+ newr->num_entries = 0;
+ newr->first_ref = NULL;
+ newr->controls = NULL;
/* put this entry as first */
- new->prev = NULL;
- new->next = priv->store;
- if (priv->store != NULL) priv->store->prev = new;
- priv->store = new;
+ newr->prev = NULL;
+ newr->next = priv->store;
+ if (priv->store != NULL) priv->store->prev = newr;
+ priv->store = newr;
- talloc_set_destructor(new, store_destructor);
+ talloc_set_destructor(newr, store_destructor);
- return new;
+ return newr;
}
struct paged_context {