Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed goto statements #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed goto statements #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions vmtouch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,18 +428,19 @@ void vmtouch_file(char *path) {

len_of_file = sb.st_size;

retry_open:
for (;;) {
fd = open(path, O_RDONLY, 0);

fd = open(path, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENFILE || errno == EMFILE) {
increment_nofile_rlimit();
continue;
}

if (fd == -1) {
if (errno == ENFILE || errno == EMFILE) {
increment_nofile_rlimit();
goto retry_open;
warning("unable to open %s (%s), skipping", path, strerror(errno));
return;
}

warning("unable to open %s (%s), skipping", path, strerror(errno));
return;
break;
}

if (max_len > 0 && (offset + max_len) < len_of_file) {
Expand Down Expand Up @@ -621,35 +622,34 @@ void vmtouch_crawl(char *path) {

crawl_inodes[curr_crawl_depth] = sb.st_ino;

retry_opendir:
for (;;) {
dirp = opendir(path);

dirp = opendir(path);
if (dirp == NULL) {
if (errno == ENFILE || errno == EMFILE) {
increment_nofile_rlimit();
continue;
}

if (dirp == NULL) {
if (errno == ENFILE || errno == EMFILE) {
increment_nofile_rlimit();
goto retry_opendir;
warning("unable to opendir %s (%s), skipping", path, strerror(errno));
return;
}

warning("unable to opendir %s (%s), skipping", path, strerror(errno));
return;
break;
}

while((de = readdir(dirp)) != NULL) {
if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue;

if (snprintf(npath, sizeof(npath), "%s/%s", path, de->d_name) >= sizeof(npath)) {
warning("path too long %s", path);
goto bail;
break;
}

curr_crawl_depth++;
vmtouch_crawl(npath);
curr_crawl_depth--;
}

bail:

if (closedir(dirp)) {
warning("unable to closedir %s (%s)", path, strerror(errno));
return;
Expand Down