Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Jun 2013 00:15:57 +0200 (CEST)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        mm@FreeBSD.org
Subject:   ports/179543: [PATCH] net-im/jabberd : Fix build with clang
Message-ID:  <3bWfRK3vc0z1VV@micro.madpilot.net>
Resent-Message-ID: <201306132230.r5DMU0ig006112@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179543
>Category:       ports
>Synopsis:       [PATCH] net-im/jabberd : Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 13 22:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 9.1-STABLE FreeBSD 9.1-STABLE #18 r244955: Wed Jan 2 10:46:21 CET 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64

>Description:

Fix build with clang due to function returniing values when they
shuuld and vice versa.

The patches are coming from the porject's own github repository.

Maintainer is CCed.

>How-To-Repeat:
>Fix:

Index: files/patch-s2s-out.c
===================================================================
--- files/patch-s2s-out.c	(revision 0)
+++ files/patch-s2s-out.c	(working copy)
@@ -0,0 +1,11 @@
+--- s2s/out.c.orig	2012-08-22 08:03:58.000000000 +0200
++++ s2s/out.c	2013-06-13 23:25:13.528682146 +0200
+@@ -627,7 +627,7 @@
+             nad_free(pkt->nad);
+         free(pkt);
+ 
+-        return;
++        return 0;
+     }
+ 
+     /* new route key */

Property changes on: files/patch-s2s-out.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-sm-mod_roster.c
===================================================================
--- files/patch-sm-mod_roster.c	(revision 0)
+++ files/patch-sm-mod_roster.c	(working copy)
@@ -0,0 +1,11 @@
+--- sm/mod_roster.c.orig	2012-02-12 22:36:18.000000000 +0100
++++ sm/mod_roster.c	2013-06-13 23:42:35.669583304 +0200
+@@ -460,7 +460,7 @@
+     log_debug(ZONE, "added %s to roster (to %d from %d ask %d name %s ngroups %d)", jid_full(item->jid), item->to, item->from, item->ask, item->name, item->ngroups);
+ 
+     if (sm_storage_rate_limit(sess->user->sm, jid_user(sess->user->jid)))
+-        return -stanza_err_RESOURCE_CONSTRAINT;
++        return;
+ 
+     /* save changes */
+     _roster_save_item(sess->user, item);

Property changes on: files/patch-sm-mod_roster.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3bWfRK3vc0z1VV>