diff options
| author | Rocky Bernstein <rockyb@users.sourceforge.net> | 2005-01-01 02:43:56 +0000 |
|---|---|---|
| committer | Rocky Bernstein <rockyb@users.sourceforge.net> | 2005-01-01 02:43:56 +0000 |
| commit | 01d976496634a07467382bfb7c621f95792946b7 (patch) | |
| tree | 39bf1a66b7f7517e27f2da388ed99a20d5b1f450 /src/input/vcd/libcdio/util.c | |
| parent | 5c8aac6caa78d6ea1a635ba6a0162d2c41b20a74 (diff) | |
| download | xine-lib-01d976496634a07467382bfb7c621f95792946b7.tar.gz xine-lib-01d976496634a07467382bfb7c621f95792946b7.tar.bz2 | |
Update internal (and messy) copies to libcdio 0.71 and
vcdimager 0.7.21.
CVS patchset: 7313
CVS date: 2005/01/01 02:43:56
Diffstat (limited to 'src/input/vcd/libcdio/util.c')
| -rw-r--r-- | src/input/vcd/libcdio/util.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/input/vcd/libcdio/util.c b/src/input/vcd/libcdio/util.c index 55717a15f..9c646daf6 100644 --- a/src/input/vcd/libcdio/util.c +++ b/src/input/vcd/libcdio/util.c @@ -1,5 +1,5 @@ /* - $Id: util.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $ + $Id: util.c,v 1.3 2005/01/01 02:43:57 rockyb Exp $ Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> @@ -28,10 +28,15 @@ #include <stdio.h> #include <string.h> +#ifdef HAVE_INTTYPES_H +#include "inttypes.h" +#endif + #include "cdio_assert.h" +#include <cdio/types.h> #include <cdio/util.h> -static const char _rcsid[] = "$Id: util.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $"; +static const char _rcsid[] = "$Id: util.c,v 1.3 2005/01/01 02:43:57 rockyb Exp $"; size_t _cdio_strlenv(char **str_array) @@ -169,15 +174,15 @@ _cdio_strdup_upper (const char str[]) } uint8_t -to_bcd8 (uint8_t n) +cdio_to_bcd8 (uint8_t n) { - cdio_assert (n < 100); + /*cdio_assert (n < 100);*/ return ((n/10)<<4) | (n%10); } uint8_t -from_bcd8(uint8_t p) +cdio_from_bcd8(uint8_t p) { return (0xf & p)+(10*(p >> 4)); } |