1
0
forked from pool/libosmo-abis
Jan Engelhardt 2013-06-02 23:50:56 +00:00 committed by Git OBS Bridge
parent dbea067089
commit 9887d8e34d
5 changed files with 98 additions and 7 deletions

View File

@ -0,0 +1,38 @@
From 4b6860db447ffb3997acd7394ea822f29303e797 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 9 Mar 2013 17:32:33 +0100
Subject: [PATCH 1/2] lapd: Do not override t203_sec initialization.
This was spotted by clang3.3 and got broken in git revision
f42280b6a235163ab935abc9fd36b60716d7a460 when moving to the
C99 initializer.
Warning:
input/lapd.c:106:30: warning: initializer overrides prior initialization of this subobject
[-Winitializer-overrides]
.t203_sec = 20, .t203_sec = 0,
^
input/lapd.c:106:14: note: previous initialization is here
.t203_sec = 20, .t203_sec = 0,
^~
1 warning generated.
---
src/input/lapd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/input/lapd.c b/src/input/lapd.c
index bced94a..ac24fd8 100644
--- a/src/input/lapd.c
+++ b/src/input/lapd.c
@@ -103,7 +103,7 @@ const struct lapd_profile lapd_profile_sat = {
.t200_sec = 2, .t200_usec = 400000,
.t201_sec = 2, .t201_usec = 400000,
.t202_sec = 2, .t202_usec = 400000,
- .t203_sec = 20, .t203_sec = 0,
+ .t203_sec = 20, .t203_usec = 0,
.short_address = 1
};
--
1.8.2

View File

@ -0,0 +1,40 @@
From 5731dd74f76e7b9c6778ee57937fc92bb8be34d3 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 9 Mar 2013 17:35:17 +0100
Subject: [PATCH 2/2] misdn: Set ret to 0 when using the LAPD from userspace
Warning:
input/misdn.c:252:6: warning: variable 'ret' is used uninitialized whenever 'if' condition is
true [-Wsometimes-uninitialized]
if (mline->use_userspace_lapd) {
^~~~~~~~~~~~~~~~~~~~~~~~~
input/misdn.c:289:9: note: uninitialized use occurs here
return ret;
^~~
input/misdn.c:252:2: note: remove the 'if' if its condition is always false
if (mline->use_userspace_lapd) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
input/misdn.c:241:9: note: initialize the variable 'ret' to silence this warning
int ret;
^
= 0
1 warning generated.
---
src/input/misdn.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/input/misdn.c b/src/input/misdn.c
index 5fdd847..a72a21e 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -255,6 +255,7 @@ static int handle_ts1_write(struct osmo_fd *bfd)
osmo_hexdump(msg->data, msg->len));
lapd_transmit(e1i_ts->lapd, sign_link->tei,
sign_link->sapi, msg);
+ ret = 0;
} else {
l2_data = msg->data;
--
1.8.2

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:49e65d3666fe8c933b811f77dd1d5c3f4e51075ac57ea9a9040f90d6b39c9149 oid sha256:9ff6ad09b91563696da3eedf680e95976df2e5b14d1f62d11f34d6e0df097ff3
size 62592 size 62892

10
libosmo-abis.changes Normal file
View File

@ -0,0 +1,10 @@
-------------------------------------------------------------------
Sun Jun 2 23:50:42 UTC 2013 - jengelh@inai.de
- Add 0001-lapd-Do-not-override-t203_sec-initialization.patch,
0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch
-------------------------------------------------------------------
Fri Feb 22 09:03:06 UTC 2013 - jengelh@inai.de
- Initial package (version 0.1.5) for build.opensuse.org

View File

@ -17,17 +17,20 @@
Name: libosmo-abis Name: libosmo-abis
Summary: Osmocom library for A-bis interface Summary: Osmocom library for A-bis interface between BTS and BSC
License: AGPL-3.0+ and GPL-2.0+ License: AGPL-3.0+ and GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Version: 0.1.5 Version: 0.1.5
Release: 0 Release: 0
Url: http://osmocom.org/ Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis
#Git-Clone: git://git.osmocom.org/libosmo-abis #Git-Clone: git://git.osmocom.org/libosmo-abis
# Source generated from tag "0.1.5" (commit 5731dd74f76e7b9c6778ee57937fc92bb8be34d3)
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: osmo-version.diff Patch1: osmo-version.diff
Patch2: osmo-talloc.diff Patch2: osmo-talloc.diff
Patch3: 0001-lapd-Do-not-override-t203_sec-initialization.patch
Patch4: 0002-misdn-Set-ret-to-0-when-using-the-LAPD-from-userspac.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake >= 1.6 BuildRequires: automake >= 1.6
@ -42,7 +45,7 @@ BuildRequires: pkgconfig(ortp) >= 0.13.1
%description %description
%package -n libosmoabis1 %package -n libosmoabis1
Summary: A-bis core library Summary: A-bis interface core library
License: AGPL-3.0+ License: AGPL-3.0+
Group: System/Libraries Group: System/Libraries
@ -74,8 +77,8 @@ Requires: libosmotrau0 = %version
%description -n libosmotrau-devel %description -n libosmotrau-devel
%prep %prep
%setup -q %setup -qn %name
%patch -P 1 -P 2 -p1 %patch -P 1 -P 2 -P 3 -P 4 -p1
%build %build
autoreconf -fiv autoreconf -fiv