summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2014-04-23 08:55:48 +0200
committerYorhel <git@yorhel.nl>2014-04-23 08:55:48 +0200
commit82f95f8685f0c39873976a34be3921a8fef1a0de (patch)
tree20a636075aa436efb1bd0d92cf57cc860ed2e254 /src
parente5c81182990c823cd1e481e3c8f0525f2899f9f1 (diff)
Various fixes and improvements found by LLVM's scan-build
As reported by http://dev.yorhel.nl/ncdc/bug/64
Diffstat (limited to 'src')
-rw-r--r--src/cc.c2
-rw-r--r--src/commands.c12
-rw-r--r--src/fl_util.c2
-rw-r--r--src/net.c3
-rw-r--r--src/search.c2
-rw-r--r--src/util.c2
6 files changed, 10 insertions, 13 deletions
diff --git a/src/cc.c b/src/cc.c
index 9dbc416..2ed09e8 100644
--- a/src/cc.c
+++ b/src/cc.c
@@ -847,7 +847,7 @@ static void adc_handle(net_t *net, char *msg, int _len) {
}
if(cmd.type != 'C') {
- g_message("CC:%s: Not a client command: %s. --> %s", net_remoteaddr(cc->net), err->message, msg);
+ g_message("CC:%s: Not a client command: %s", net_remoteaddr(cc->net), msg);
g_strfreev(cmd.argv);
return;
}
diff --git a/src/commands.c b/src/commands.c
index 3952e31..f234d18 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -56,7 +56,7 @@ static cmd_t *getcmd(const char *name) {
// Get documentation for a command. May be slow at first, but caches the doc
// structure later on.
static doc_cmd_t *getdoc(cmd_t *cmd) {
- doc_cmd_t empty = { "", NULL, "No documentation available." };
+ static doc_cmd_t empty = { "", NULL, "No documentation available." };
if(cmd->doc)
return cmd->doc;
doc_cmd_t *i = (doc_cmd_t *)doc_cmds;
@@ -416,7 +416,6 @@ static void c_open(char *args) {
return;
}
- ui_tab_t *tab = ui_tab_cur->data;
gboolean conn = TRUE;
if(strncmp(args, "-n ", 3) == 0) {
conn = FALSE;
@@ -444,16 +443,13 @@ static void c_open(char *args) {
}
// Open or select tab
if(!n) {
- tab = uit_hub_create(name, addr ? FALSE : conn);
+ ui_tab_t *tab = uit_hub_create(name, addr ? FALSE : conn);
ui_tab_open(tab, TRUE, NULL);
listen_refresh();
- } else if(n != ui_tab_cur) {
+ } else if(n != ui_tab_cur)
ui_tab_cur = n;
- tab = n->data;
- } else {
+ else
ui_m(NULL, 0, addr ? "Tab already selected, saving new address instead." : "Tab already selected.");
- tab = n->data;
- }
// Save address and (re)connect when necessary
if(addr && c_connect_set_hubaddr(addr) && conn)
c_reconnect("");
diff --git a/src/fl_util.c b/src/fl_util.c
index 3475ad4..b03261e 100644
--- a/src/fl_util.c
+++ b/src/fl_util.c
@@ -280,7 +280,7 @@ fl_list_t *fl_list_from_path(fl_list_t *root, const char *path) {
void fl_list_suggest(fl_list_t *root, char *opath, char **sug) {
fl_list_t *parent = root;
char *path = g_strdup(opath);
- char *name = path;
+ char *name;
char *sep = strrchr(path, '/');
if(sep) {
*sep = 0;
diff --git a/src/net.c b/src/net.c
index 8051d4e..f981c30 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1307,7 +1307,8 @@ void net_disconnect(net_t *n) {
case NETST_ASY:
case NETST_DIS:
n->rd_cb = NULL;
- if(n->syn) {
+ s = n->syn;
+ if(s) {
syn_cancel(n);
syn_free(s);
}
diff --git a/src/search.c b/src/search.c
index 88472c7..5c77473 100644
--- a/src/search.c
+++ b/src/search.c
@@ -537,7 +537,7 @@ gboolean search_handle_udp(const char *addr, char *pack, int len) {
}
// handle message
- char *next = msg;
+ char *next;
while((next = strchr(msg, adc ? '\n' : '|')) != NULL) {
*(next++) = 0;
g_debug("%s:%s< %s", sudp ? "SUDP" : "UDP", addr, msg);
diff --git a/src/util.c b/src/util.c
index f4521ab..9ed3bf2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -467,8 +467,8 @@ gboolean file_move(const char *from, const char *to, gboolean overwrite, GError
if(r <= 0)
break;
+ char *p = buf;
while(r > 0) {
- char *p = buf;
int w = write(tofd, p, r);
if(w < 0 && errno == EINTR)
continue;