Changeset 745 for trunk/server/source4/ntvfs/common/notify.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/ntvfs/common/notify.c (modified) (9 diffs)

trunk/server/source4/ntvfs/common/notify.c

@@ -26 +26 @@
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "../lib/util/util_tdb.h"
 #include "messaging/messaging.h"
-#include "tdb_wrap.h"
+#include "lib/util/tdb_wrap.h"
 #include "lib/messaging/irpc.h"
-#include "librpc/gen_ndr/ndr_notify.h"
+#include "librpc/gen_ndr/ndr_s4_notify.h"
 #include "../lib/util/dlinklist.h"
 #include "ntvfs/common/ntvfs_common.h"
@@ -37 +37 @@
 #include "cluster/cluster.h"
 #include "param/param.h"
+#include "lib/util/tsort.h"
 
 struct notify_context {
@@ -46 +47 @@
         int seqnum;
         struct sys_notify_context *sys_notify_ctx;
-        struct smb_iconv_convenience *iconv_convenience;
 };
 
@@ -113 +113 @@
         notify->list = NULL;
         notify->array = NULL;
-        notify->iconv_convenience = lp_iconv_convenience(lp_ctx);
         notify->seqnum = tdb_get_seqnum(notify->w->tdb);
 
@@ -178 +177 @@
         blob.length = dbuf.dsize;
 
-        ndr_err = ndr_pull_struct_blob(&blob, notify->array, notify->iconv_convenience,
-                                       notify->array,
+        ndr_err = ndr_pull_struct_blob(&blob, notify->array, notify->array,
                                        (ndr_pull_flags_fn_t)ndr_pull_notify_array);
         free(dbuf.dptr);
@@ -227 +225 @@
         NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
 
-        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, notify->iconv_convenience, notify->array,
+        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, notify->array,
                                        (ndr_push_flags_fn_t)ndr_push_notify_array);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -263 +261 @@
         }
 
-        ndr_err = ndr_pull_struct_blob(data, tmp_ctx, notify->iconv_convenience, &ev,
+        ndr_err = ndr_pull_struct_blob(data, tmp_ctx, &ev,
                                       (ndr_pull_flags_fn_t)ndr_pull_notify_event);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -329 +327 @@
         d->max_mask_subdir |= e->subdir_filter;
 
-        if (d->num_entries > 1) {
-                qsort(d->entries, d->num_entries, sizeof(d->entries[0]), notify_compare);
-        }
+        TYPESAFE_QSORT(d->entries, d->num_entries, notify_compare);
 
         /* recalculate the maximum masks */
@@ -562 +558 @@
         tmp_ctx = talloc_new(notify);
 
-        ndr_err = ndr_push_struct_blob(&data, tmp_ctx, notify->iconv_convenience, &ev, (ndr_push_flags_fn_t)ndr_push_notify_event);
+        ndr_err = ndr_push_struct_blob(&data, tmp_ctx, &ev, (ndr_push_flags_fn_t)ndr_push_notify_event);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                 talloc_free(tmp_ctx);