Attachment 10863 Details for Bug 11153 – cherry-picked patch from master

[patch] cherry-picked patch from master

patch (text/plain), 1.20 KB, created by Christof Schmitt on 2015-03-12 04:32:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christof Schmitt

Created: 2015-03-12 04:32:55 UTC

Size: 1.20 KB

patch

obsolete

>From fbb852b7a64c3407982bd7c84ca8ac5ceb63d66d Mon Sep 17 00:00:00 2001
>From: Christof Schmitt <cs@samba.org>
>Date: Wed, 11 Mar 2015 15:54:55 -0700
>Subject: [PATCH] brlock: Use 0 instead of empty initializer list
>
>C does not allow empty initializer lists. Although gcc accepts that, the
>SunOS compiler fails in this case with an error.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11153
>
>Signed-off-by: Christof Schmitt <cs@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>
>Autobuild-User(master): Christof Schmitt <cs@samba.org>
>Autobuild-Date(master): Thu Mar 12 02:49:36 CET 2015 on sn-devel-104
>(cherry picked from commit ddcf3614ce14e7cb03195e36f872043542bc4ec1)
>---
> source3/locking/brlock.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
>index 7d4d838..1a468d0 100644
>--- a/source3/locking/brlock.c
>+++ b/source3/locking/brlock.c
>@@ -2005,7 +2005,7 @@ static void brl_get_locks_readonly_parser(TDB_DATA key, TDB_DATA data,
> 		*state->br_lock = NULL;
> 		return;
> 	}
>-	*br_lck = (struct byte_range_lock) {};
>+	*br_lck = (struct byte_range_lock) { 0 };
> 	if (!brl_parse_data(br_lck, data)) {
> 		*state->br_lock = NULL;
> 		return;
>-- 
>1.7.1
>

Flags:

cs: review+
obnox: review+

Actions: View

Attachments on bug 11153: 10854 | 10863