[Pkg-ofed-commits] [librdmacm] 01/06: Imported Upstream version 1.0.19.1
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Thu Sep 4 08:34:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository librdmacm.
commit c93345a94c4a7c068c8d97975fcda66ae9e90bcc
Author: Ana Guerrero López <ana at ekaia.org>
Date: Thu Sep 4 10:20:41 2014 +0200
Imported Upstream version 1.0.19.1
---
configure | 20 ++++++++++----------
configure.ac | 2 +-
examples/udpong.c | 2 +-
librdmacm.spec | 4 ++--
librdmacm.spec.in | 2 +-
src/indexer.c | 2 +-
src/rsocket.c | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/configure b/configure
index 7ac8a67..84f929d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for librdmacm 1.0.19.
+# Generated by GNU Autoconf 2.67 for librdmacm 1.0.19.1.
#
# Report bugs to <linux-rdma at vger.kernel.org>.
#
@@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='librdmacm'
PACKAGE_TARNAME='librdmacm'
-PACKAGE_VERSION='1.0.19'
-PACKAGE_STRING='librdmacm 1.0.19'
+PACKAGE_VERSION='1.0.19.1'
+PACKAGE_STRING='librdmacm 1.0.19.1'
PACKAGE_BUGREPORT='linux-rdma at vger.kernel.org'
PACKAGE_URL=''
@@ -1423,7 +1423,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures librdmacm 1.0.19 to adapt to many kinds of systems.
+\`configure' configures librdmacm 1.0.19.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1493,7 +1493,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of librdmacm 1.0.19:";;
+ short | recursive ) echo "Configuration of librdmacm 1.0.19.1:";;
esac
cat <<\_ACEOF
@@ -1597,7 +1597,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-librdmacm configure 1.0.19
+librdmacm configure 1.0.19.1
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2190,7 +2190,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by librdmacm $as_me 1.0.19, which was
+It was created by librdmacm $as_me 1.0.19.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -3009,7 +3009,7 @@ fi
# Define the identity of the package.
PACKAGE='librdmacm'
- VERSION='1.0.19'
+ VERSION='1.0.19.1'
cat >>confdefs.h <<_ACEOF
@@ -12362,7 +12362,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by librdmacm $as_me 1.0.19, which was
+This file was extended by librdmacm $as_me 1.0.19.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12428,7 +12428,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-librdmacm config.status 1.0.19
+librdmacm config.status 1.0.19.1
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index e6de2af..0f5390e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
-AC_INIT([librdmacm],[1.0.19],[linux-rdma at vger.kernel.org])
+AC_INIT([librdmacm],[1.0.19.1],[linux-rdma at vger.kernel.org])
AC_CONFIG_SRCDIR([src/cma.c])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config)
diff --git a/examples/udpong.c b/examples/udpong.c
index af8deb9..7ec11e8 100644
--- a/examples/udpong.c
+++ b/examples/udpong.c
@@ -347,7 +347,7 @@ static ssize_t client_recv(struct message *msg, size_t size, int timeout)
}
ret = rs_recv(rs, msg, size, flags | MSG_DONTWAIT);
- if (ret < 0 && (errno == EWOULDBLOCK || errno == EAGAIN))
+ if (ret < 0 && errno != EWOULDBLOCK && errno != EAGAIN)
perror("rrecv");
return ret;
diff --git a/librdmacm.spec b/librdmacm.spec
index d5ea212..a2e0ab5 100644
--- a/librdmacm.spec
+++ b/librdmacm.spec
@@ -1,7 +1,7 @@
-%define ver 1.0.19
+%define ver 1.0.19.1
Name: librdmacm
-Version: 1.0.19
+Version: 1.0.19.1
Release: 1%{?dist}
Summary: Userspace RDMA Connection Manager
diff --git a/librdmacm.spec.in b/librdmacm.spec.in
index ecb6556..81dca99 100644
--- a/librdmacm.spec.in
+++ b/librdmacm.spec.in
@@ -1,7 +1,7 @@
%define ver @VERSION@
Name: librdmacm
-Version: 1.0.19
+Version: 1.0.19.1
Release: 1%{?dist}
Summary: Userspace RDMA Connection Manager
diff --git a/src/indexer.c b/src/indexer.c
index b9e400b..f9042f5 100644
--- a/src/indexer.c
+++ b/src/indexer.c
@@ -35,11 +35,11 @@
# include <config.h>
#endif /* HAVE_CONFIG_H */
+#include <errno.h>
#include <sys/types.h>
#include <stdlib.h>
#include "indexer.h"
-#include "cma.h"
/*
* Indexer - to find a structure given an index
diff --git a/src/rsocket.c b/src/rsocket.c
index c7a0cb2..7007897 100644
--- a/src/rsocket.c
+++ b/src/rsocket.c
@@ -3915,8 +3915,8 @@ static int rs_svc_grow_sets(struct rs_svc *svc, int grow_size)
rss = set;
contexts = set + sizeof(*rss) * svc->size;
if (svc->cnt) {
- memcpy(rss, svc->rss, sizeof(*rss) * svc->cnt);
- memcpy(contexts, svc->contexts, svc->context_size * svc->cnt);
+ memcpy(rss, svc->rss, sizeof(*rss) * (svc->cnt + 1));
+ memcpy(contexts, svc->contexts, svc->context_size * (svc->cnt + 1));
}
free(svc->rss);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/librdmacm.git
More information about the Pkg-ofed-commits
mailing list