diff options
| author | maximilian attems | 2008-07-30 11:46:32 +0200 |
|---|---|---|
| committer | Karel Zak | 2008-07-30 13:26:58 +0200 |
| commit | d144727bc3e5f77692fc2d6b5c1dbf5d05fc495c (patch) | |
| tree | 6d0e94d31cc05862eb171216a73e9c917a63cd0b /disk-utils | |
| parent | mount: retry on ENOMEDIUM (diff) | |
| download | kernel-qcow2-util-linux-d144727bc3e5f77692fc2d6b5c1dbf5d05fc495c.tar.gz kernel-qcow2-util-linux-d144727bc3e5f77692fc2d6b5c1dbf5d05fc495c.tar.xz kernel-qcow2-util-linux-d144727bc3e5f77692fc2d6b5c1dbf5d05fc495c.zip | |
use getpagesize()
getpagesize() is said to be more portable than sysconf(_SC_PAGESIZE)
to anything Linux.
this patch helps klibc porting effort as the sysconf
multiplex API is not supported there.
also remove comment of the switch to sysconf in mkswap.c.
Signed-off-by: maximilian attems <max@stro.at>
Diffstat (limited to 'disk-utils')
| -rw-r--r-- | disk-utils/fsck.cramfs.c | 2 | ||||
| -rw-r--r-- | disk-utils/mkfs.cramfs.c | 2 | ||||
| -rw-r--r-- | disk-utils/mkswap.c | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c index 2d082efbc..aeb766fb3 100644 --- a/disk-utils/fsck.cramfs.c +++ b/disk-utils/fsck.cramfs.c @@ -675,7 +675,7 @@ int main(int argc, char **argv) int start = 0; size_t length; - page_size = sysconf(_SC_PAGESIZE); + page_size = getpagesize(); if (argc) progname = argv[0]; diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c index 04d8ab8ec..7882e3324 100644 --- a/disk-utils/mkfs.cramfs.c +++ b/disk-utils/mkfs.cramfs.c @@ -735,7 +735,7 @@ int main(int argc, char **argv) u32 crc = crc32(0L, Z_NULL, 0); int c; - blksize = sysconf(_SC_PAGESIZE); + blksize = getpagesize(); total_blocks = 0; if (argc) { diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index f7dbdf399..9d1ca3d59 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -132,10 +132,6 @@ is_sparc64(void) { * * What to do? Let us allow the user to specify the pagesize explicitly. * - * Update 05-Feb-2007 (kzak): - * - use sysconf(_SC_PAGESIZE) to be consistent with the rest of - * util-linux code. It is the standardized and preferred way of - * querying page size. */ static int user_pagesize; static int pagesize; @@ -145,7 +141,7 @@ struct swap_header_v1 *p; static void init_signature_page(void) { - int kernel_pagesize = pagesize = (int) sysconf(_SC_PAGESIZE); + int kernel_pagesize = pagesize = getpagesize(); if (user_pagesize) { if ((user_pagesize & (user_pagesize-1)) || |