summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2004-01-16 12:10:56 +0000
committerMarc Espie <espie@cvs.openbsd.org>2004-01-16 12:10:56 +0000
commit12c1c728ae2777b80453905caca5dd24dde0a87b (patch)
tree971c7ae4950160028eb6149d4688b056ca596894 /usr.bin
parent3efdb37dc04a5282f2785a1b6b6adf536046bbab (diff)
fix printf formats, unsigned wants %u
okay millert@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cdio/cdio.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c
index 1f25e292e52..c7acb7248cf 100644
--- a/usr.bin/cdio/cdio.c
+++ b/usr.bin/cdio/cdio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdio.c,v 1.32 2004/01/14 07:32:58 miod Exp $ */
+/* $OpenBSD: cdio.c,v 1.33 2004/01/16 12:10:55 espie Exp $ */
/* Copyright (c) 1995 Serge V. Vakulenko
* All rights reserved.
@@ -551,64 +551,64 @@ play(char *arg)
unsigned char tm, ts, tf;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (8 == sscanf(arg, "%d %d:%d.%d %d %d:%d.%d",
+ if (8 == sscanf(arg, "%d %u:%u.%u %d %u:%u.%u",
&tr1, &m1, &s1, &f1, &tr2, &m2, &s2, &f2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (7 == sscanf(arg, "%d %d:%d %d %d:%d.%d",
+ if (7 == sscanf(arg, "%d %u:%u %d %u:%u.%u",
&tr1, &m1, &s1, &tr2, &m2, &s2, &f2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (7 == sscanf(arg, "%d %d:%d.%d %d %d:%d",
+ if (7 == sscanf(arg, "%d %u:%u.%u %d %u:%u",
&tr1, &m1, &s1, &f1, &tr2, &m2, &s2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (7 == sscanf(arg, "%d %d:%d.%d %d:%d.%d",
+ if (7 == sscanf(arg, "%d %u:%u.%u %u:%u.%u",
&tr1, &m1, &s1, &f1, &m2, &s2, &f2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (6 == sscanf(arg, "%d %d:%d.%d %d:%d",
+ if (6 == sscanf(arg, "%d %u:%u.%u %u:%u",
&tr1, &m1, &s1, &f1, &m2, &s2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (6 == sscanf(arg, "%d %d:%d %d:%d.%d",
+ if (6 == sscanf(arg, "%d %u:%u %u:%u.%u",
&tr1, &m1, &s1, &m2, &s2, &f2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (6 == sscanf(arg, "%d %d:%d.%d %d %d",
+ if (6 == sscanf(arg, "%d %u:%u.%u %d %u",
&tr1, &m1, &s1, &f1, &tr2, &m2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (5 == sscanf(arg, "%d %d:%d %d:%d", &tr1, &m1, &s1, &m2, &s2))
+ if (5 == sscanf(arg, "%d %u:%u %u:%u", &tr1, &m1, &s1, &m2, &s2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (5 == sscanf(arg, "%d %d:%d %d %d",
+ if (5 == sscanf(arg, "%d %u:%u %d %u",
&tr1, &m1, &s1, &tr2, &m2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (5 == sscanf(arg, "%d %d:%d.%d %d",
+ if (5 == sscanf(arg, "%d %u:%u.%u %d",
&tr1, &m1, &s1, &f1, &tr2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (4 == sscanf(arg, "%d %d:%d %d", &tr1, &m1, &s1, &tr2))
+ if (4 == sscanf(arg, "%d %u:%u %u", &tr1, &m1, &s1, &tr2))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (4 == sscanf(arg, "%d %d:%d.%d", &tr1, &m1, &s1, &f1))
+ if (4 == sscanf(arg, "%d %u:%u.%u", &tr1, &m1, &s1, &f1))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
- if (3 == sscanf(arg, "%d %d:%d", &tr1, &m1, &s1))
+ if (3 == sscanf(arg, "%d %u:%u", &tr1, &m1, &s1))
goto Play_Relative_Addresses;
tr2 = m2 = s2 = f2 = f1 = 0;
@@ -729,13 +729,13 @@ Play_Relative_Addresses:
return (play_msf(m1, s1, f1, m2, s2, f2));
Try_Absolute_Timed_Addresses:
- if (6 != sscanf(arg, "%d:%d.%d%d:%d.%d",
+ if (6 != sscanf(arg, "%u:%u.%u%u:%u.%u",
&m1, &s1, &f1, &m2, &s2, &f2) &&
- 5 != sscanf(arg, "%d:%d.%d%d:%d", &m1, &s1, &f1, &m2, &s2) &&
- 5 != sscanf(arg, "%d:%d%d:%d.%d", &m1, &s1, &m2, &s2, &f2) &&
- 3 != sscanf(arg, "%d:%d.%d", &m1, &s1, &f1) &&
- 4 != sscanf(arg, "%d:%d%d:%d", &m1, &s1, &m2, &s2) &&
- 2 != sscanf(arg, "%d:%d", &m1, &s1))
+ 5 != sscanf(arg, "%u:%u.%u%u:%u", &m1, &s1, &f1, &m2, &s2) &&
+ 5 != sscanf(arg, "%u:%u%u:%u.%u", &m1, &s1, &m2, &s2, &f2) &&
+ 3 != sscanf(arg, "%u:%u.%u", &m1, &s1, &f1) &&
+ 4 != sscanf(arg, "%u:%u%u:%u", &m1, &s1, &m2, &s2) &&
+ 2 != sscanf(arg, "%u:%u", &m1, &s1))
goto Clean_up;
if (m2 == 0) {