aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2018-08-14 02:28:22 +0200
committerToni Uhlig <matzeton@googlemail.com>2018-08-14 02:28:22 +0200
commit4f15e80ce4bfabdf86fe92892b0b8f9adcaceca7 (patch)
tree2ef71c1f5c4779ae08c647be4eb614de9a0a0ed8
parent2d52167be3846c076518ddd28d5ad1d55fdd33e0 (diff)
fixed some code style issues reported by codacy
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
-rw-r--r--src/capabilities.c6
-rw-r--r--src/compat.c6
-rw-r--r--src/pevent.c3
-rw-r--r--src/utils.c2
4 files changed, 9 insertions, 8 deletions
diff --git a/src/capabilities.c b/src/capabilities.c
index 0fa81bc..f09419d 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -188,9 +188,9 @@ static int caps_find_name(const char *name)
void caps_check_list(const char *clist, void (*callback)(int))
{
- char *str = NULL;
- char *ptr = NULL;
- char *start = NULL;
+ char *str;
+ char *ptr;
+ char *start;
int nr;
assert(clist && *clist != '\0');
diff --git a/src/compat.c b/src/compat.c
index 72c78a3..33d250a 100644
--- a/src/compat.c
+++ b/src/compat.c
@@ -68,11 +68,12 @@ potd_localtime(const time_t *timep, struct tm *result)
int
potd_getpwnam(const char *name, struct passwd *pwd)
{
- struct passwd *result = NULL;
+ struct passwd *result;
errno = 0;
#ifdef HAVE_GETPWNAM_R
char buf[BUFSIZ];
+ result = NULL;
return getpwnam_r(name, pwd, buf, sizeof buf, &result) || !result;
#else
@@ -87,11 +88,12 @@ potd_getpwnam(const char *name, struct passwd *pwd)
int
potd_getgrnam(const char *name, struct group *grp)
{
- struct group *result = NULL;
+ struct group *result;
errno = 0;
#ifdef HAVE_GETGRNAM_R
char buf[BUFSIZ];
+ result = NULL;
return getgrnam_r(name, grp, buf, sizeof buf, &result) || !result;
#else
diff --git a/src/pevent.c b/src/pevent.c
index 224c805..9f0ef91 100644
--- a/src/pevent.c
+++ b/src/pevent.c
@@ -241,7 +241,6 @@ forward_state
event_forward_connection(event_ctx *ctx, int dest_fd, on_data_cb on_data,
void *user_data)
{
- int data_avail = 1;
int saved_errno;
forward_state rc = CON_OK;
ssize_t siz;
@@ -253,7 +252,7 @@ event_forward_connection(event_ctx *ctx, int dest_fd, on_data_cb on_data,
ev = &ctx->events[ctx->current_event];
ev_buf = (event_buf *) ev->data.ptr;
- while (data_avail) {
+ while (1) {
saved_errno = 0;
siz = -1;
diff --git a/src/utils.c b/src/utils.c
index 172c6b4..8aabd09 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -102,7 +102,7 @@ static inline void bin2hex_char(unsigned char c, char hexc[5]);
static void print_stack_trace(void)
{
int i, trace_size = 0;
- char **call_stack = NULL;
+ char **call_stack;
trace_size = backtrace(stack_traces, MAX_STACK_FRAMES);
call_stack = backtrace_symbols(stack_traces, trace_size);