Attachment 2800 Details for Bug 4763 – Second patch

[patch] Second patch

look (text/plain), 1.12 KB, created by Jeremy Allison on 2007-07-06 16:46:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2007-07-06 16:46:24 UTC

Size: 1.12 KB

patch

obsolete

>Index: smbd/notify.c
>===================================================================
>--- smbd/notify.c	(revision 23734)
>+++ smbd/notify.c	(working copy)
>@@ -50,6 +50,17 @@
> 	uint16 mid;
> };
> 
>+static BOOL notify_change_record_identical(struct notify_change *c1,
>+					struct notify_change *c2)
>+{
>+	/* Note this is deliberately case sensitive. */
>+	if (c1->action == c2->action &&
>+			strcmp(c1->name, c2->name) == 0) {
>+		return True;
>+	}
>+	return False;
>+}
>+
> static BOOL notify_marshall_changes(int num_changes,
> 				    struct notify_change *changes,
> 				    prs_struct *ps)
>@@ -58,11 +69,20 @@
> 	UNISTR uni_name;
> 
> 	for (i=0; i<num_changes; i++) {
>-		struct notify_change *c = &changes[i];
>+		struct notify_change *c;
> 		size_t namelen;
> 		uint32 u32_tmp;	/* Temp arg to prs_uint32 to avoid
> 				 * signed/unsigned issues */
> 
>+		/* Coalesce any identical records. */
>+		while (i+1 < num_changes &&
>+			notify_change_record_identical(&changes[i],
>+						&changes[i+1])) {
>+			i++;
>+		}
>+
>+		c = &changes[i];
>+
> 		namelen = convert_string_allocate(
> 			NULL, CH_UNIX, CH_UTF16LE, c->name, strlen(c->name)+1,
> 			&uni_name.buffer, True);

Actions: View

Attachments on bug 4763: 2799 | 2800 | 2824 | 2826