diff options
| author | Volker Lendecke <vl@samba.org> | 2020-04-21 14:24:48 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-08-06 13:32:39 +0000 |
| commit | 05e0dfbb8042ffa00cd71a666794c053d976d7b2 (patch) | |
| tree | 07efddfe35f48d18501b42cdc641014e7a3cb906 | |
| parent | 247d43c93cc2fd769573e92defde2c904a10abea (diff) | |
| download | samba-05e0dfbb8042ffa00cd71a666794c053d976d7b2.tar.gz | |
srvsvc: Directly use "ctr3->count" instead of "i"
To me this was not very transparent, and now that we have "ctr3" a
single indirect looks okay
Bug: https://bugzilla.samba.org/show_bug.cgi?id=14355
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 96d68bb9f26a0c99d00e92130a2f2c91c7b985e2)
| -rw-r--r-- | source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index b81de3d2b9e..a24ea638624 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -89,7 +89,6 @@ static int enum_file_fn(struct file_id id, (struct file_enum_count *)private_data; struct srvsvc_NetFileCtr3 *ctr3 = fenum->ctr3; struct srvsvc_NetFileInfo3 *f; - int i = ctr3->count; files_struct fsp; struct byte_range_lock *brl; int num_locks = 0; @@ -114,9 +113,9 @@ static int enum_file_fn(struct file_id id, fenum->ctx, ctr3->array, struct srvsvc_NetFileInfo3, - i+1); + ctr3->count+1); if ( !f ) { - DEBUG(0,("conn_enum_fn: realloc failed for %d items\n", i+1)); + DBG_ERR("realloc failed for %"PRIu32" items\n", ctr3->count+1); return 0; } ctr3->array = f; @@ -154,7 +153,7 @@ static int enum_file_fn(struct file_id id, /* now fill in the srvsvc_NetFileInfo3 struct */ - ctr3->array[i] = (struct srvsvc_NetFileInfo3) { + ctr3->array[ctr3->count] = (struct srvsvc_NetFileInfo3) { .fid = (((uint32_t)(procid_to_pid(&e->pid))<<16) | e->share_file_id), .permissions = permissions, |