shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

Merge pull request #5085 from keszybz/variables

Browse Source 
Fixes for gcc and coverity warnings
This commit is contained in:
Martin Pitt 2017-01-16 07:56:53 +01:00 committed by GitHub
commit 8171bcc70f
7 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/basic/process-util.c
View File

@ -104,7 +104,7 @@ int get_process_comm(pid_t pid, char **name) {
int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line) {
_cleanup_fclose_ FILE *f = NULL;
bool space = false;
char *r = NULL, *k;
char *k, *ans = NULL;
const char *p;
int c;
@ -118,7 +118,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
* command line that resolves to the empty string will return the "comm" name of the process instead.
*
* Returns -ESRCH if the process doesn't exist, and -ENOENT if the process has no command line (and
* comm_fallback is false). */
* comm_fallback is false). Returns 0 and sets *line otherwise. */
p = procfs_file_alloca(pid, "cmdline");
@ -132,11 +132,11 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
if (max_length == 1) {
/* If there's only room for one byte, return the empty string */
r = new0(char, 1);
if (!r)
ans = new0(char, 1);
if (!ans)
return -ENOMEM;
*line = r;
*line = ans;
return 0;
} else if (max_length == 0) {
@ -144,36 +144,36 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
while ((c = getc(f)) != EOF) {
if (!GREEDY_REALLOC(r, allocated, len+3)) {
free(r);
if (!GREEDY_REALLOC(ans, allocated, len+3)) {
free(ans);
return -ENOMEM;
}
if (isprint(c)) {
if (space) {
r[len++] = ' ';
ans[len++] = ' ';
space = false;
}
r[len++] = c;
ans[len++] = c;
} else if (len > 0)
space = true;
}
if (len > 0)
r[len] = 0;
ans[len] = '\0';
else
r = mfree(r);
ans = mfree(ans);
} else {
bool dotdotdot = false;
size_t left;
r = new(char, max_length);
if (!r)
ans = new(char, max_length);
if (!ans)
return -ENOMEM;
k = r;
k = ans;
left = max_length;
while ((c = getc(f)) != EOF) {
@ -197,20 +197,20 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
*(k++) = (char) c;
left--;
} else if (k > r)
} else if (k > ans)
space = true;
}
if (dotdotdot) {
if (max_length <= 4) {
k = r;
k = ans;
left = max_length;
} else {
k = r + max_length - 4;
k = ans + max_length - 4;
left = 4;
/* Eat up final spaces */
while (k > r && isspace(k[-1])) {
while (k > ans && isspace(k[-1])) {
k--;
left++;
}
@ -223,11 +223,11 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
}
/* Kernel threads have no argv[] */
if (isempty(r)) {
if (isempty(ans)) {
_cleanup_free_ char *t = NULL;
int h;
free(r);
free(ans);
if (!comm_fallback)
return -ENOENT;
@ -237,22 +237,22 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
return h;
if (max_length == 0)
r = strjoin("[", t, "]");
ans = strjoin("[", t, "]");
else {
size_t l;
l = strlen(t);
if (l + 3 <= max_length)
r = strjoin("[", t, "]");
ans = strjoin("[", t, "]");
else if (max_length <= 6) {
r = new(char, max_length);
if (!r)
ans = new(char, max_length);
if (!ans)
return -ENOMEM;
memcpy(r, "[...]", max_length-1);
r[max_length-1] = 0;
memcpy(ans, "[...]", max_length-1);
ans[max_length-1] = 0;
} else {
char *e;
@ -264,14 +264,14 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
e--;
*e = 0;
r = strjoin("[", t, "...]");
ans = strjoin("[", t, "...]");
}
}
if (!r)
if (!ans)
return -ENOMEM;
}
*line = r;
*line = ans;
return 0;
}

1
src/cryptsetup/cryptsetup.c
View File

@ -750,6 +750,7 @@ int main(int argc, char *argv[]) {
} else {
log_error("Unknown verb %s.", argv[1]);
r = -EINVAL;
goto finish;
}

11
src/journal/journalctl.c
View File

@ -683,11 +683,12 @@ static int parse_argv(int argc, char *argv[]) {
case ARG_VERIFY_KEY:
arg_action = ACTION_VERIFY;
arg_verify_key = strdup(optarg);
if (!arg_verify_key)
return -ENOMEM;
arg_merge = false;
r = free_and_strdup(&arg_verify_key, optarg);
if (r < 0)
return r;
string_erase(optarg);
arg_merge = false;
break;
case ARG_INTERVAL:
@ -888,7 +889,7 @@ static int parse_argv(int argc, char *argv[]) {
* to users, and automatically turn --unit= into --user-unit= if combined with --user. */
r = strv_extend_strv(&arg_user_units, arg_system_units, true);
if (r < 0)
return -ENOMEM;
return r;
arg_system_units = strv_free(arg_system_units);
}

4
src/nspawn/nspawn.c
View File

@ -3470,8 +3470,8 @@ static int run(int master,
}
static int load_root_hash(const char *image) {
_cleanup_free_ char *text = NULL;
char *fn, *n, *e;
_cleanup_free_ char *text = NULL, *fn = NULL;
char *n, *e;
void *k;
size_t l;
int r;

6
src/shared/install-printf.c
View File

@ -93,9 +93,9 @@ static int specifier_instance(char specifier, void *data, void *userdata, char *
return r;
if (isempty(instance)) {
instance = strdup(i->default_instance ?: "");
if (!instance)
return -ENOMEM;
r = free_and_strdup(&instance, i->default_instance ?: "");
if (r < 0)
return r;
}
*ret = instance;

5
src/systemctl/systemctl.c
View File

@ -450,7 +450,7 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
unsigned basic_len;
id_len = MIN(max_id_len, 25u); /* as much as it needs, but at most 25 for now */
basic_len = circle_len + 5 + id_len + 5 + active_len + sub_len;
basic_len = circle_len + 1 + id_len + 1 + load_len + 1 + active_len + 1 + sub_len + 1;
if (job_count)
basic_len += job_len + 1;
@ -472,7 +472,8 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
id_len += incr;
desc_len += MIN(extra_len - incr, max_desc_len - desc_len);
}
}
} else
desc_len = 0;
} else {
id_len = max_id_len;
desc_len = max_desc_len;

2
src/udev/udev-event.c
View File

@ -213,7 +213,7 @@ subst:
_s = s;
_l = l;
/* temporarily use sbuf */
s = &sbuf;
s = sbuf;
l = UTIL_PATH_SIZE;
}