aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/getopt.c6
-rw-r--r--util-linux/volume_id/hfs.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 6ec5cb0cd..2da348176 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -158,10 +158,10 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
158 158
159 /* Reset getopt(3) (see libbb/getopt32.c for long rant) */ 159 /* Reset getopt(3) (see libbb/getopt32.c for long rant) */
160#ifdef __GLIBC__ 160#ifdef __GLIBC__
161 optind = 0; 161 optind = 0;
162#else /* BSD style */ 162#else /* BSD style */
163 optind = 1; 163 optind = 1;
164 /* optreset = 1; */ 164 /* optreset = 1; */
165#endif 165#endif
166 166
167 while (1) { 167 while (1) {
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index a7667f725..79658e4fa 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -160,7 +160,7 @@ int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off)
160 160
161 buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200); 161 buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
162 if (buf == NULL) 162 if (buf == NULL)
163 return -1; 163 return -1;
164 164
165 hfs = (struct hfs_mdb *) buf; 165 hfs = (struct hfs_mdb *) buf;
166 if (hfs->signature[0] != 'B' || hfs->signature[1] != 'D') 166 if (hfs->signature[0] != 'B' || hfs->signature[1] != 'D')