aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-06-11 22:00:54 -0700
committerRob Landley <rob@landley.net>2016-06-12 01:22:53 -0500
commit001e4fb62baee6770c3b076ece56446f8d2550de (patch)
tree6a49f03aaa2532832744a1b8da7ad07b105303ba
parent4b925a785bd9712f9a30a8b30497e6966993ae8e (diff)
downloadtoybox-001e4fb62baee6770c3b076ece56446f8d2550de.tar.gz
Finish switching to dev_major/dev_minor.
7ca5dc4232b9ac5ee5cd25c8b5b33a58904cd251 didn't switch all callers over to the new functions.
-rw-r--r--toys/other/stat.c4
-rw-r--r--toys/pending/lsof.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/toys/other/stat.c b/toys/other/stat.c
index 47c10b42..9f77a600 100644
--- a/toys/other/stat.c
+++ b/toys/other/stat.c
@@ -114,8 +114,8 @@ static void print_stat(char type)
xprintf(" -> `%s'", toybuf);
} else if (type == 'o') out('u', stat->st_blksize);
else if (type == 's') out('u', stat->st_size);
- else if (type == 't') out('x', major(stat->st_rdev));
- else if (type == 'T') out('x', minor(stat->st_rdev));
+ else if (type == 't') out('x', dev_major(stat->st_rdev));
+ else if (type == 'T') out('x', dev_minor(stat->st_rdev));
else if (type == 'u') out('u', stat->st_uid);
else if (type == 'U') xprintf("%8s", TT.user_name->pw_name);
else if (type == 'x') date_stat_format((void *)&stat->st_atime);
diff --git a/toys/pending/lsof.c b/toys/pending/lsof.c
index e99b011a..436fdd2a 100644
--- a/toys/pending/lsof.c
+++ b/toys/pending/lsof.c
@@ -277,8 +277,8 @@ static void fill_stat(struct file_info *fi, const char *path)
// Fill DEVICE.
dev = (S_ISBLK(sb.st_mode) || S_ISCHR(sb.st_mode)) ? sb.st_rdev : sb.st_dev;
if (!S_ISSOCK(sb.st_mode))
- snprintf(fi->device, sizeof(fi->device), "%ld,%ld",
- (long)major(dev), (long)minor(dev));
+ snprintf(fi->device, sizeof(fi->device), "%d,%d",
+ dev_major(dev), dev_minor(dev));
// Fill SIZE/OFF.
if (S_ISREG(sb.st_mode) || S_ISDIR(sb.st_mode))