sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

lib: Remove "num_contexts" from poll_funcs_state

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2015-10-20 11:15:38 +02:00
parent e987e6212a
commit d9dd026815
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/poll_funcs/poll_funcs_tevent.c
View File

@ -48,7 +48,6 @@ struct poll_funcs_state {
* "contexts is the array of tevent_contexts that serve * "contexts is the array of tevent_contexts that serve
* "watches". "contexts" can contain NULL pointers. * "watches". "contexts" can contain NULL pointers.
*/ */
unsigned num_contexts;
struct poll_funcs_tevent_context **contexts; struct poll_funcs_tevent_context **contexts;
}; };
@ -104,7 +103,7 @@ static bool poll_funcs_watch_find_slot(struct poll_funcs_state *state,
size_t *slot) size_t *slot)
{ {
struct poll_watch **watches; struct poll_watch **watches;
size_t i, num_watches; size_t i, num_watches, num_contexts;
num_watches = talloc_array_length(state->watches); num_watches = talloc_array_length(state->watches);
@ -123,7 +122,9 @@ static bool poll_funcs_watch_find_slot(struct poll_funcs_state *state,
watches[num_watches] = NULL; watches[num_watches] = NULL;
state->watches = watches; state->watches = watches;
for (i=0; i<state->num_contexts; i++) { num_contexts = talloc_array_length(state->contexts);
for (i=0; i<num_contexts; i++) {
struct tevent_fd **fdes; struct tevent_fd **fdes;
struct poll_funcs_tevent_context *c = state->contexts[i]; struct poll_funcs_tevent_context *c = state->contexts[i];
if (c == NULL) { if (c == NULL) {
@ -161,8 +162,7 @@ static struct poll_watch *tevent_watch_new(
struct poll_funcs_state *state = talloc_get_type_abort( struct poll_funcs_state *state = talloc_get_type_abort(
funcs->private_data, struct poll_funcs_state); funcs->private_data, struct poll_funcs_state);
struct poll_watch *w; struct poll_watch *w;
unsigned i; size_t i, slot, num_contexts;
size_t slot;
if (!poll_funcs_watch_find_slot(state, &slot)) { if (!poll_funcs_watch_find_slot(state, &slot)) {
return NULL; return NULL;
@ -183,7 +183,9 @@ static struct poll_watch *tevent_watch_new(
talloc_set_destructor(w, poll_watch_destructor); talloc_set_destructor(w, poll_watch_destructor);
for (i=0; i<state->num_contexts; i++) { num_contexts = talloc_array_length(state->contexts);
for (i=0; i<num_contexts; i++) {
struct poll_funcs_tevent_context *c = state->contexts[i]; struct poll_funcs_tevent_context *c = state->contexts[i];
if (c == NULL) { if (c == NULL) {
continue; continue;
@ -204,12 +206,13 @@ fail:
static int poll_watch_destructor(struct poll_watch *w) static int poll_watch_destructor(struct poll_watch *w)
{ {
struct poll_funcs_state *state = w->state; struct poll_funcs_state *state = w->state;
size_t num_contexts = talloc_array_length(state->contexts);
size_t slot = w->slot; size_t slot = w->slot;
unsigned i; size_t i;
TALLOC_FREE(state->watches[slot]); TALLOC_FREE(state->watches[slot]);
for (i=0; i<state->num_contexts; i++) { for (i=0; i<num_contexts; i++) {
struct poll_funcs_tevent_context *c = state->contexts[i]; struct poll_funcs_tevent_context *c = state->contexts[i];
if (c == NULL) { if (c == NULL) {
continue; continue;
@ -223,12 +226,13 @@ static int poll_watch_destructor(struct poll_watch *w)
static void tevent_watch_update(struct poll_watch *w, short events) static void tevent_watch_update(struct poll_watch *w, short events)
{ {
struct poll_funcs_state *state = w->state; struct poll_funcs_state *state = w->state;
size_t num_contexts = talloc_array_length(state->contexts);
size_t slot = w->slot; size_t slot = w->slot;
unsigned i; size_t i;
w->events = poll_events_to_tevent(events); w->events = poll_events_to_tevent(events);
for (i=0; i<state->num_contexts; i++) { for (i=0; i<num_contexts; i++) {
struct poll_funcs_tevent_context *c = state->contexts[i]; struct poll_funcs_tevent_context *c = state->contexts[i];
if (c == NULL) { if (c == NULL) {
continue; continue;
@ -315,12 +319,13 @@ static int poll_funcs_state_destructor(struct poll_funcs_state *state)
*/ */
static bool poll_funcs_context_slot_find(struct poll_funcs_state *state, static bool poll_funcs_context_slot_find(struct poll_funcs_state *state,
struct tevent_context *ev, struct tevent_context *ev,
unsigned *slot) size_t *slot)
{ {
struct poll_funcs_tevent_context **contexts; struct poll_funcs_tevent_context **contexts;
unsigned i; size_t num_contexts = talloc_array_length(state->contexts);
size_t i;
for (i=0; i<state->num_contexts; i++) { for (i=0; i<num_contexts; i++) {
struct poll_funcs_tevent_context *ctx = state->contexts[i]; struct poll_funcs_tevent_context *ctx = state->contexts[i];
if ((ctx == NULL) || (ctx->ev == ev)) { if ((ctx == NULL) || (ctx->ev == ev)) {
@ -331,15 +336,14 @@ static bool poll_funcs_context_slot_find(struct poll_funcs_state *state,
contexts = talloc_realloc(state, state->contexts, contexts = talloc_realloc(state, state->contexts,
struct poll_funcs_tevent_context *, struct poll_funcs_tevent_context *,
state->num_contexts + 1); num_contexts + 1);
if (contexts == NULL) { if (contexts == NULL) {
return false; return false;
} }
state->contexts = contexts; state->contexts = contexts;
state->contexts[state->num_contexts] = NULL; state->contexts[num_contexts] = NULL;
*slot = state->num_contexts; *slot = num_contexts;
state->num_contexts += 1;
return true; return true;
} }
@ -423,7 +427,7 @@ void *poll_funcs_tevent_register(TALLOC_CTX *mem_ctx, struct poll_funcs *f,
struct poll_funcs_state *state = talloc_get_type_abort( struct poll_funcs_state *state = talloc_get_type_abort(
f->private_data, struct poll_funcs_state); f->private_data, struct poll_funcs_state);
struct poll_funcs_tevent_handle *handle; struct poll_funcs_tevent_handle *handle;
unsigned slot; size_t slot;
handle = talloc(mem_ctx, struct poll_funcs_tevent_handle); handle = talloc(mem_ctx, struct poll_funcs_tevent_handle);
if (handle == NULL) { if (handle == NULL) {