Attachment 13081 Details for Bug 12693 – git-am fix for 4.6.next, 4.5.next.

[patch] git-am fix for 4.6.next, 4.5.next.

0001-Changes-to-make-the-Solaris-C-compiler-happy.patch (text/plain), 1.12 KB, created by Jeremy Allison on 2017-03-17 20:02:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-03-17 20:02:54 UTC

Size: 1.12 KB

patch

obsolete

>From cd88cf2694340d12e26b13a5e7e62b792f74102f Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 16 Mar 2017 09:17:51 -0700
>Subject: [PATCH 1/2] Changes to make the Solaris C compiler happy.
>
>Fix Bug 12693 dbwrap_watch.c syntax error before or at: }
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12693
>
>Signed-off-by: Tom schulz <schulz@adi.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 2780a56d0bb7848e017314a033ef22ee944d8b05)
>---
> source3/lib/dbwrap/dbwrap_watch.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/lib/dbwrap/dbwrap_watch.c b/source3/lib/dbwrap/dbwrap_watch.c
>index a44f6f131f2..289d3bed6b2 100644
>--- a/source3/lib/dbwrap/dbwrap_watch.c
>+++ b/source3/lib/dbwrap/dbwrap_watch.c
>@@ -278,7 +278,7 @@ static struct db_record *dbwrap_watched_fetch_locked(
> 	num_watchers = dbwrap_watched_parse(subrec_value, NULL, 0, NULL, NULL);
> 	if (num_watchers == -1) {
> 		/* Fresh or invalid record */
>-		rec->value = (TDB_DATA) {};
>+		rec->value = (TDB_DATA) { 0 };
> 		return rec;
> 	}
> 
>-- 
>2.12.0.367.g23dc2f6d3c-goog
>

Flags:

vl: review+

Actions: View

Attachments on bug 12693: 13067 | 13081