[SCM] CTDB repository - branch master updated -
ctdb-1.0.81-20-g0c88fa4
Ronnie Sahlberg
sahlberg at samba.org
Wed May 13 06:13:23 GMT 2009
The branch, master has been updated
via 0c88fa41bc3c629052bc137ed30c473ed10522fd (commit)
via 13270a011016bf20bbf721f6d083b2f113fdbc79 (commit)
via 7498e176817719eadd91201bbd0d9ceb91eefdae (commit)
from b321dfd1d23492169ac25ed901d49d7c69ad5340 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0c88fa41bc3c629052bc137ed30c473ed10522fd
Author: Michael Adam <obnox at samba.org>
Date: Tue May 12 07:56:23 2009 +0200
ping pong: fix logic for mmap reads vs. preads
Michael
commit 13270a011016bf20bbf721f6d083b2f113fdbc79
Author: Michael Adam <obnox at samba.org>
Date: Tue May 12 22:59:35 2009 +0200
maketarball.sh: add GPL license header
Michael
commit 7498e176817719eadd91201bbd0d9ceb91eefdae
Author: Michael Adam <obnox at samba.org>
Date: Tue May 12 22:59:08 2009 +0200
makerpms.sh: add GPL license header
Michael
-----------------------------------------------------------------------
Summary of changes:
packaging/RPM/makerpms.sh | 26 ++++++++++++++++++++++----
packaging/maketarball.sh | 18 ++++++++++++++++++
utils/ping_pong/ping_pong.c | 2 +-
3 files changed, 41 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh
index 37eca7d..846ab7f 100755
--- a/packaging/RPM/makerpms.sh
+++ b/packaging/RPM/makerpms.sh
@@ -1,10 +1,28 @@
#!/bin/sh
+#
+# makerpms.sh - build RPM packages from the git sources
+#
# Copyright (C) John H Terpstra 1998-2002
-# Gerald (Jerry) Carter 2003
-# Jim McDonough 2007
-# Andrew Tridgell 2007
-# Michael Adam 2008
+# Copyright (C) Gerald (Jerry) Carter 2003
+# Copyright (C) Jim McDonough 2007
+# Copyright (C) Andrew Tridgell 2007
+# Copyright (C) Michael Adam 2008-2009
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
+#
# The following allows environment variables to override the target directories
# the alternative is to have a file in your home directory calles .rpmmacros
# containing the following:
diff --git a/packaging/maketarball.sh b/packaging/maketarball.sh
index 2cb1609..18e57a2 100755
--- a/packaging/maketarball.sh
+++ b/packaging/maketarball.sh
@@ -1,10 +1,28 @@
#!/bin/sh
#
+# maketarball.sh - create a tarball from the git branch HEAD
+#
# Copyright (C) Michael Adam 2009
#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+#
# Create CTDB source tarball of the current git branch HEAD.
# The version is extracted from the spec file...
# The first extra argument will be added as an additional version.
+#
DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/..
diff --git a/utils/ping_pong/ping_pong.c b/utils/ping_pong/ping_pong.c
index fd0e99b..90692e5 100644
--- a/utils/ping_pong/ping_pong.c
+++ b/utils/ping_pong/ping_pong.c
@@ -115,7 +115,7 @@ static void ping_pong(int fd, int num_locks)
unsigned char c;
if (use_mmap) {
c = p[i];
- } if (pread(fd, &c, 1, i) != 1) {
+ } else if (pread(fd, &c, 1, i) != 1) {
printf("read failed at %d\n", i);
}
incr = c - val[i];
--
CTDB repository
More information about the samba-cvs
mailing list