mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-14 20:54:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead lines in various places

Browse Source 
As pointed-out by clang -Wunreachable-code.

No behaviour changes.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-02-22 19:26:27 -05:00
parent e9a2e453bb
commit bdd13f6be4
13 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bootchart/bootchart.c
View File

@ -220,7 +220,6 @@ static int parse_args(int argc, char *argv[]) {
fprintf(stderr, " --help, -h Display this message\n");
fprintf(stderr, "See bootchart.conf for more information.\n");
exit (EXIT_SUCCESS);
break;
default:
break;
}

2
src/bus-proxyd/bus-proxyd.c
View File

@ -774,8 +774,6 @@ int main(int argc, char *argv[]) {
}
}
r = 0;
finish:
sd_bus_flush(a);
sd_bus_flush(b);

4
src/core/service.c
View File

@ -1436,9 +1436,7 @@ static int service_search_main_pid(Service *s) {
log_warning_unit(UNIT(s)->id,
"Failed to watch PID "PID_FMT" from service %s",
pid, UNIT(s)->id);
return r;
return 0;
return r;
}
static void service_set_state(Service *s, ServiceState state) {

2
src/journal/journal-file.c
View File

@ -2210,8 +2210,6 @@ int journal_file_move_to_entry_by_monotonic_for_data(
z = q;
}
return 0;
}
int journal_file_move_to_entry_by_seqnum_for_data(

18
src/journal/journald-server.c
View File

@ -1131,15 +1131,13 @@ int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userda
union {
struct cmsghdr cmsghdr;
/* We use NAME_MAX space for the
* SELinux label here. The kernel
* currently enforces no limit, but
* according to suggestions from the
* SELinux people this will change and
* it will probably be identical to
* NAME_MAX. For now we use that, but
* this should be updated one day when
* the final limit is known.*/
/* We use NAME_MAX space for the SELinux label
* here. The kernel currently enforces no
* limit, but according to suggestions from
* the SELinux people this will change and it
* will probably be identical to NAME_MAX. For
* now we use that, but this should be updated
* one day when the final limit is known.*/
uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
CMSG_SPACE(sizeof(struct timeval)) +
CMSG_SPACE(sizeof(int)) + /* fd */
@ -1216,8 +1214,6 @@ int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userda
close_many(fds, n_fds);
}
return 0;
}
static int dispatch_sigusr1(sd_event_source *es, const struct signalfd_siginfo *si, void *userdata) {

2
src/journal/sd-journal.c
View File

@ -2293,8 +2293,6 @@ _public_ int sd_journal_process(sd_journal *j) {
l -= step;
}
}
return determine_change(j);
}
_public_ int sd_journal_wait(sd_journal *j, uint64_t timeout_usec) {

2
src/libsystemd/sd-event/sd-event.c
View File

@ -1814,8 +1814,6 @@ static int process_signal(sd_event *e, uint32_t events) {
if (r < 0)
return r;
}
return 0;
}
static int source_dispatch(sd_event_source *s) {

12
src/libsystemd/sd-rtnl/rtnl-message.c
View File

@ -480,7 +480,7 @@ int sd_rtnl_message_append_u16(sd_rtnl_message *m, unsigned short type, uint16_t
break;
else
return -ENOTSUP;
break;
default:
return -ENOTSUP;
}
@ -932,10 +932,6 @@ int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret) {
if (k > 0)
switch (m->hdr->nlmsg_type) {
struct ifinfomsg *ifi;
struct ifaddrmsg *ifa;
struct rtmsg *rtm;
/* check that the size matches the message type */
case NLMSG_ERROR:
if (m->hdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
@ -948,6 +944,8 @@ int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret) {
if (m->hdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct ifinfomsg)))
k = -EIO;
else {
struct ifinfomsg *ifi;
ifi = NLMSG_DATA(m->hdr);
UPDATE_RTA(m, IFLA_RTA(ifi));
}
@ -958,6 +956,8 @@ int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret) {
if (m->hdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct ifaddrmsg)))
k = -EIO;
else {
struct ifaddrmsg *ifa;
ifa = NLMSG_DATA(m->hdr);
UPDATE_RTA(m, IFA_RTA(ifa));
}
@ -968,6 +968,8 @@ int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret) {
if (m->hdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct rtmsg)))
k = -EIO;
else {
struct rtmsg *rtm;
rtm = NLMSG_DATA(m->hdr);
UPDATE_RTA(m, RTM_RTA(rtm));
}

2
src/login/logind.c
View File

@ -1078,8 +1078,6 @@ int manager_run(Manager *m) {
if (r < 0)
return r;
}
return 0;
}
static int manager_parse_config_file(Manager *m) {

2
src/shared/install.c
View File

@ -469,8 +469,6 @@ static int find_symlinks_fd(
return 1;
}
}
return r;
}
static int find_symlinks(

4
src/shared/time-dst.c
View File

@ -207,8 +207,8 @@ read_again:
if (type_idxs[i] >= num_types)
return -EINVAL;
if ((BYTE_ORDER != BIG_ENDIAN && (sizeof(time_t) == 4 || trans_width == 4)) ||
(BYTE_ORDER == BIG_ENDIAN && sizeof(time_t) == 8 && trans_width == 4)) {
if (BYTE_ORDER == BIG_ENDIAN ? sizeof(time_t) == 8 && trans_width == 4
: sizeof(time_t) == 4 || trans_width == 4) {
/* Decode the transition times, stored as 4-byte integers in
network (big-endian) byte order. We work from the end of
the array so as not to clobber the next element to be

1
src/udev/scsi_id/scsi_id.c
View File

@ -396,7 +396,6 @@ static int set_options(struct udev *udev,
case 'V':
printf("%s\n", VERSION);
exit(0);
break;
case 'x':
export = true;

3
src/udev/udevadm-info.c
View File

@ -498,8 +498,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[])
print_record(device);
break;
default:
fprintf(stderr, "unknown query type\n");
break;
assert_not_reached("unknown query type");
}
break;
case ACTION_ATTRIBUTE_WALK: