emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Avoid dead branches.

Browse Source 
* lib/subordinateio.c: Avoid dead branches.

Note: code is equivalent.
This commit is contained in:
Nicolas François 2013-08-13 23:55:48 +02:00
parent 00f573fce2
commit b84b918464
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-08-13 Nicolas François <nicolas.francois@centraliens.net>
* lib/subordinateio.c: Avoid dead branches.
2013-08-13 Nicolas François <nicolas.francois@centraliens.net>
* src/vipw.c: Fail in case arguments are provided after options.

60
lib/subordinateio.c
View File

@ -309,39 +309,43 @@ static int remove_range(struct commonio_db *db,
if ((end < first) || (start > last))
continue;
/* Is entry completely contained in the range to remove? */
if ((start <= first) && (end >= last)) {
commonio_del_entry (db, ent);
}
/* Is just the start of the entry removed? */
else if ((start <= first) && (end < last)) {
range->start = end + 1;
range->count = (last - range->start) + 1;
if (start <= first) {
if (end >= last) {
/* entry completely contained in the
* range to remove */
commonio_del_entry (db, ent);
} else {
/* Remove only the start of the entry */
range->start = end + 1;
range->count = (last - range->start) + 1;
ent->changed = true;
db->changed = true;
}
/* Is just the end of the entry removed? */
else if ((start > first) && (end >= last)) {
range->count = start - range->start;
ent->changed = true;
db->changed = true;
}
} else {
if (end >= last) {
/* Remove only the end of the entry */
range->count = start - range->start;
ent->changed = true;
db->changed = true;
}
/* The middle of the range is removed */
else {
struct subordinate_range tail;
tail.owner = range->owner;
tail.start = end + 1;
tail.count = (last - tail.start) + 1;
ent->changed = true;
db->changed = true;
} else {
/* Remove the middle of the range
* This requires to create a new range */
struct subordinate_range tail;
tail.owner = range->owner;
tail.start = end + 1;
tail.count = (last - tail.start) + 1;
if (!commonio_append(db, &tail))
return 0;
if (commonio_append(db, &tail) == 0) {
return 0;
}
range->count = start - range->start;
range->count = start - range->start;
ent->changed = true;
db->changed = true;
ent->changed = true;
db->changed = true;
}
}
}