[PATCH] Fix splint warning on ubuntu 11.04
by Angus Salkeld
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
lib/ipc_us.c | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/lib/ipc_us.c b/lib/ipc_us.c
index 846db52..5ed0ced 100644
--- a/lib/ipc_us.c
+++ b/lib/ipc_us.c
@@ -641,11 +641,9 @@ qb_ipcs_uc_recv_and_auth(int32_t sock, void *msg, size_t len,
struct iovec iov_recv;
#ifdef QB_LINUX
- struct cmsghdr *cmsg;
char cmsg_cred[CMSG_SPACE(sizeof(struct ucred))];
int off = 0;
int on = 1;
- struct ucred *cred;
#endif
msg_recv.msg_flags = 0;
msg_recv.msg_iov = &iov_recv;
@@ -718,16 +716,19 @@ qb_ipcs_uc_recv_and_auth(int32_t sock, void *msg, size_t len,
/*
* Usually Linux systems
*/
- cmsg = CMSG_FIRSTHDR(&msg_recv);
- assert(cmsg != NULL);
- cred = (struct ucred *)CMSG_DATA(cmsg);
- if (cred) {
- res = 0;
- ugp->pid = cred->pid;
- ugp->uid = cred->uid;
- ugp->gid = cred->gid;
- } else {
- res = -EBADMSG;
+ {
+ struct ucred *cred;
+ struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg_recv);
+ assert(cmsg != NULL);
+ cred = (struct ucred *)CMSG_DATA(cmsg);
+ if (cred) {
+ res = 0;
+ ugp->pid = cred->pid;
+ ugp->uid = cred->uid;
+ ugp->gid = cred->gid;
+ } else {
+ res = -EBADMSG;
+ }
}
#else /* no credentials */
ugp->pid = 0;
--
1.7.6
12 years, 9 months
[PATCH 1/3] Remove TODO from dist_doc_DATA
by Angus Salkeld
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 624baf5..a64a7fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
ACLOCAL_AMFLAGS = -I m4
-dist_doc_DATA = COPYING INSTALL README.markdown TODO
+dist_doc_DATA = COPYING INSTALL README.markdown
SUBDIRS = include lib docs tests
--
1.7.6
12 years, 9 months
[PATCH] Delete TODO (use github issues)
by Angus Salkeld
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
TODO | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
delete mode 100644 TODO
diff --git a/TODO b/TODO
deleted file mode 100644
index 02aaf3b..0000000
--- a/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-Last Updated: 18-May-2011
-
-IPC
----
-* client or server to specify the message size
-* glib integration
--
1.7.6
12 years, 9 months
[PATCH 1/2] LOG: add string.h to qblog.h
by Angus Salkeld
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
include/qb/qblog.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/qb/qblog.h b/include/qb/qblog.h
index c841697..edc83cc 100644
--- a/include/qb/qblog.h
+++ b/include/qb/qblog.h
@@ -33,6 +33,7 @@ extern "C" {
#include <stdio.h>
#include <errno.h>
#include <syslog.h>
+#include <string.h>
#include <qb/qbconfig.h>
#ifdef S_SPLINT_S
--
1.7.6
12 years, 9 months