Mercurial > libdvdread4.hg
annotate dvd_input.c @ 92:7ab44001373e src tip
Use 0 instead of NULL in integer comparison
Both GCC 4.8.2 and Clang 3.4 warn about a format mismatch in a
comparison.
libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -mno-ms-bitfields -O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOUR
CE -MT ifo_read.lo -MD -MP -MF .deps/ifo_read.Tpo -c ifo_read.c -fPIC -DPIC -o .libs/ifo_read.o
[?]
ifo_read.c: In function 'ifoRead_PTL_MAIT':
ifo_read.c:1313:34: warning: comparison between pointer and integer [enabled by default]
if(ifofile->vmgi_mat->ptl_mait == NULL)
libtool: compile: clang -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -MT ifo_read.
lo -MD -MP -MF .deps/ifo_read.Tpo -c ifo_read.c -fPIC -DPIC -o .libs/ifo_read.o
[?]
ifo_read.c:1313:34: warning: comparison between pointer and integer ('uint32_t' (aka 'unsigned int') and 'void *')
if(ifofile->vmgi_mat->ptl_mait == NULL)
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~
Fix this by using the integer 0 instead of `NULL`.
Patch by Paul Menzel <paulepanter AT users DOT sourceforge DOT net>
| author | rathann |
|---|---|
| date | Wed, 04 Dec 2013 22:44:23 +0000 |
| parents | 4cbc44b20dfe |
| children |
| rev | line source |
|---|---|
| 3 | 1 /* |
| 2 * Copyright (C) 2002 Samuel Hocevar <sam@zoy.org>, | |
| 22 | 3 * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> |
| 3 | 4 * |
|
21
4aa618ae094f
Use consistent license headers everywhere: Fix FSF address and boilerplate.
diego
parents:
20
diff
changeset
|
5 * This file is part of libdvdread. |
|
4aa618ae094f
Use consistent license headers everywhere: Fix FSF address and boilerplate.
diego
parents:
20
diff
changeset
|
6 * |
|
4aa618ae094f
Use consistent license headers everywhere: Fix FSF address and boilerplate.
diego
parents:
20
diff
changeset
|
7 * libdvdread is free software; you can redistribute it and/or modify |
| 3 | 8 * it under the terms of the GNU General Public License as published by |
| 9 * the Free Software Foundation; either version 2 of the License, or | |
| 10 * (at your option) any later version. | |
| 20 | 11 * |
|
21
4aa618ae094f
Use consistent license headers everywhere: Fix FSF address and boilerplate.
diego
parents:
20
diff
changeset
|
12 * libdvdread is distributed in the hope that it will be useful, |
| 3 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 * GNU General Public License for more details. | |
| 16 * | |
|
21
4aa618ae094f
Use consistent license headers everywhere: Fix FSF address and boilerplate.
diego
parents:
20
diff
changeset
|
17 * You should have received a copy of the GNU General Public License along |
|
4aa618ae094f
Use consistent license headers everywhere: Fix FSF address and boilerplate.
diego
parents:
20
diff
changeset
|
18 * with libdvdread; if not, write to the Free Software Foundation, Inc., |
|
4aa618ae094f
Use consistent license headers everywhere: Fix FSF address and boilerplate.
diego
parents:
20
diff
changeset
|
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
| 3 | 20 */ |
| 21 | |
| 22 #include <stdio.h> | |
| 23 #include <stdlib.h> | |
| 24 #include <fcntl.h> | |
| 25 #include <unistd.h> | |
| 26 | |
|
39
caef08851d58
Add #include for config.h. Several preprocessor definitions were used without
diego
parents:
38
diff
changeset
|
27 #include "config.h" |
|
33
c743d79f187b
Move installed headers into dvdread directory to make them easier to
reimar
parents:
30
diff
changeset
|
28 #include "dvdread/dvd_reader.h" |
| 3 | 29 #include "dvd_input.h" |
| 30 | |
| 31 | |
| 32 /* The function pointers that is the exported interface of this file. */ | |
| 33 dvd_input_t (*dvdinput_open) (const char *); | |
| 34 int (*dvdinput_close) (dvd_input_t); | |
| 35 int (*dvdinput_seek) (dvd_input_t, int); | |
| 20 | 36 int (*dvdinput_title) (dvd_input_t, int); |
| 3 | 37 int (*dvdinput_read) (dvd_input_t, void *, int, int); |
| 38 char * (*dvdinput_error) (dvd_input_t); | |
| 39 | |
| 40 #ifdef HAVE_DVDCSS_DVDCSS_H | |
| 41 /* linking to libdvdcss */ | |
| 42 #include <dvdcss/dvdcss.h> | |
| 43 #define DVDcss_open(a) dvdcss_open((char*)(a)) | |
| 44 #define DVDcss_close dvdcss_close | |
| 45 #define DVDcss_seek dvdcss_seek | |
| 46 #define DVDcss_read dvdcss_read | |
| 47 #define DVDcss_error dvdcss_error | |
| 48 #else | |
| 49 | |
| 50 /* dlopening libdvdcss */ | |
| 51 #ifdef HAVE_DLFCN_H | |
| 52 #include <dlfcn.h> | |
| 53 #else | |
| 54 /* Only needed on MINGW at the moment */ | |
| 55 #include "../../msvc/contrib/dlfcn.c" | |
| 56 #endif | |
| 57 | |
|
79
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
58 typedef struct dvdcss_s *dvdcss_t; |
|
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
59 static dvdcss_t (*DVDcss_open) (const char *); |
|
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
60 static int (*DVDcss_close) (dvdcss_t); |
|
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
61 static int (*DVDcss_seek) (dvdcss_t, int, int); |
|
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
62 static int (*DVDcss_read) (dvdcss_t, void *, int, int); |
|
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
63 static char * (*DVDcss_error) (dvdcss_t); |
|
82
aa4a7b151801
Add #define for DVDCSS_SEEK_KEY to allow compilation without dvdcss.h.
diego
parents:
81
diff
changeset
|
64 #define DVDCSS_SEEK_KEY (1 << 1) |
| 3 | 65 #endif |
| 66 | |
| 67 /* The DVDinput handle, add stuff here for new input methods. */ | |
| 68 struct dvd_input_s { | |
| 69 /* libdvdcss handle */ | |
|
79
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
70 dvdcss_t dvdcss; |
| 20 | 71 |
| 3 | 72 /* dummy file input */ |
| 73 int fd; | |
| 74 }; | |
| 75 | |
| 76 | |
| 77 /** | |
| 78 * initialize and open a DVD device or file. | |
| 79 */ | |
| 80 static dvd_input_t css_open(const char *target) | |
| 81 { | |
| 82 dvd_input_t dev; | |
| 20 | 83 |
| 3 | 84 /* Allocate the handle structure */ |
| 85 dev = (dvd_input_t) malloc(sizeof(*dev)); | |
| 86 if(dev == NULL) { | |
| 87 fprintf(stderr, "libdvdread: Could not allocate memory.\n"); | |
| 88 return NULL; | |
| 89 } | |
| 20 | 90 |
| 3 | 91 /* Really open it with libdvdcss */ |
| 92 dev->dvdcss = DVDcss_open(target); | |
| 93 if(dev->dvdcss == 0) { | |
| 94 fprintf(stderr, "libdvdread: Could not open %s with libdvdcss.\n", target); | |
| 95 free(dev); | |
| 96 return NULL; | |
| 97 } | |
| 20 | 98 |
| 3 | 99 return dev; |
| 100 } | |
| 101 | |
| 102 /** | |
| 103 * return the last error message | |
| 104 */ | |
| 105 static char *css_error(dvd_input_t dev) | |
| 106 { | |
| 107 return DVDcss_error(dev->dvdcss); | |
| 108 } | |
| 109 | |
| 110 /** | |
| 111 * seek into the device. | |
| 112 */ | |
| 113 static int css_seek(dvd_input_t dev, int blocks) | |
| 114 { | |
| 115 /* DVDINPUT_NOFLAGS should match the DVDCSS_NOFLAGS value. */ | |
| 116 return DVDcss_seek(dev->dvdcss, blocks, DVDINPUT_NOFLAGS); | |
| 117 } | |
| 118 | |
| 119 /** | |
| 18 | 120 * set the block for the beginning of a new title (key). |
| 3 | 121 */ |
| 122 static int css_title(dvd_input_t dev, int block) | |
| 123 { | |
|
80
d59aaee50e47
Replace deprecated dvdcss_title() function by dvdcss_seek().
diego
parents:
79
diff
changeset
|
124 return DVDcss_seek(dev->dvdcss, block, DVDCSS_SEEK_KEY); |
| 3 | 125 } |
| 126 | |
| 127 /** | |
| 128 * read data from the device. | |
| 129 */ | |
| 130 static int css_read(dvd_input_t dev, void *buffer, int blocks, int flags) | |
| 131 { | |
| 132 return DVDcss_read(dev->dvdcss, buffer, blocks, flags); | |
| 133 } | |
| 134 | |
| 135 /** | |
| 136 * close the DVD device and clean up the library. | |
| 137 */ | |
| 138 static int css_close(dvd_input_t dev) | |
| 139 { | |
| 140 int ret; | |
| 141 | |
| 142 ret = DVDcss_close(dev->dvdcss); | |
| 143 | |
| 144 if(ret < 0) | |
| 145 return ret; | |
| 146 | |
| 147 free(dev); | |
| 148 | |
| 149 return 0; | |
| 150 } | |
| 151 | |
| 152 /** | |
| 153 * initialize and open a DVD device or file. | |
| 154 */ | |
| 155 static dvd_input_t file_open(const char *target) | |
| 156 { | |
| 157 dvd_input_t dev; | |
| 20 | 158 |
| 3 | 159 /* Allocate the library structure */ |
| 160 dev = (dvd_input_t) malloc(sizeof(*dev)); | |
| 161 if(dev == NULL) { | |
| 162 fprintf(stderr, "libdvdread: Could not allocate memory.\n"); | |
| 163 return NULL; | |
| 164 } | |
| 20 | 165 |
| 3 | 166 /* Open the device */ |
|
40
ce7056d60f01
in OS/2 the device must be opened in binary mode; patch by KO Myung-Hun - komh chollian net
nicodvb
parents:
39
diff
changeset
|
167 #if !defined(WIN32) && !defined(__OS2__) |
| 3 | 168 dev->fd = open(target, O_RDONLY); |
| 169 #else | |
| 170 dev->fd = open(target, O_RDONLY | O_BINARY); | |
| 171 #endif | |
| 172 if(dev->fd < 0) { | |
| 173 perror("libdvdread: Could not open input"); | |
| 174 free(dev); | |
| 175 return NULL; | |
| 176 } | |
| 20 | 177 |
| 3 | 178 return dev; |
| 179 } | |
| 180 | |
| 181 /** | |
| 182 * return the last error message | |
| 183 */ | |
| 184 static char *file_error(dvd_input_t dev) | |
| 185 { | |
| 186 /* use strerror(errno)? */ | |
| 187 return (char *)"unknown error"; | |
| 188 } | |
| 189 | |
| 190 /** | |
| 191 * seek into the device. | |
| 192 */ | |
| 193 static int file_seek(dvd_input_t dev, int blocks) | |
| 194 { | |
| 195 off_t pos; | |
| 196 | |
| 197 pos = lseek(dev->fd, (off_t)blocks * (off_t)DVD_VIDEO_LB_LEN, SEEK_SET); | |
| 198 if(pos < 0) { | |
|
27
98951f8ec89c
cosmetics: Sync indentation and similar changes from libdvdread 0.9.5.
diego
parents:
26
diff
changeset
|
199 return pos; |
| 3 | 200 } |
| 201 /* assert pos % DVD_VIDEO_LB_LEN == 0 */ | |
| 202 return (int) (pos / DVD_VIDEO_LB_LEN); | |
| 203 } | |
| 204 | |
| 205 /** | |
| 18 | 206 * set the block for the beginning of a new title (key). |
| 3 | 207 */ |
| 208 static int file_title(dvd_input_t dev, int block) | |
| 209 { | |
| 210 return -1; | |
| 211 } | |
| 212 | |
| 213 /** | |
| 214 * read data from the device. | |
| 215 */ | |
| 216 static int file_read(dvd_input_t dev, void *buffer, int blocks, int flags) | |
| 217 { | |
| 218 size_t len; | |
| 219 ssize_t ret; | |
| 20 | 220 |
| 3 | 221 len = (size_t)blocks * DVD_VIDEO_LB_LEN; |
| 20 | 222 |
| 3 | 223 while(len > 0) { |
| 20 | 224 |
| 3 | 225 ret = read(dev->fd, buffer, len); |
| 20 | 226 |
| 3 | 227 if(ret < 0) { |
| 228 /* One of the reads failed, too bad. We won't even bother | |
| 18 | 229 * returning the reads that went OK, and as in the POSIX spec |
| 230 * the file position is left unspecified after a failure. */ | |
| 3 | 231 return ret; |
| 232 } | |
| 20 | 233 |
| 3 | 234 if(ret == 0) { |
| 18 | 235 /* Nothing more to read. Return all of the whole blocks, if any. |
| 236 * Adjust the file position back to the previous block boundary. */ | |
| 3 | 237 size_t bytes = (size_t)blocks * DVD_VIDEO_LB_LEN - len; |
| 238 off_t over_read = -(bytes % DVD_VIDEO_LB_LEN); | |
| 239 /*off_t pos =*/ lseek(dev->fd, over_read, SEEK_CUR); | |
| 240 /* should have pos % 2048 == 0 */ | |
| 241 return (int) (bytes / DVD_VIDEO_LB_LEN); | |
| 242 } | |
| 20 | 243 |
| 3 | 244 len -= ret; |
| 245 } | |
| 246 | |
| 247 return blocks; | |
| 248 } | |
| 249 | |
| 250 /** | |
| 251 * close the DVD device and clean up. | |
| 252 */ | |
| 253 static int file_close(dvd_input_t dev) | |
| 254 { | |
| 255 int ret; | |
| 256 | |
| 257 ret = close(dev->fd); | |
| 258 | |
| 259 if(ret < 0) | |
| 260 return ret; | |
| 261 | |
| 262 free(dev); | |
| 263 | |
| 264 return 0; | |
| 265 } | |
| 266 | |
| 267 | |
| 268 /** | |
| 269 * Setup read functions with either libdvdcss or minimal DVD access. | |
| 270 */ | |
| 271 int dvdinput_setup(void) | |
| 272 { | |
| 273 void *dvdcss_library = NULL; | |
| 274 | |
| 275 #ifdef HAVE_DVDCSS_DVDCSS_H | |
| 276 /* linking to libdvdcss */ | |
| 277 dvdcss_library = &dvdcss_library; /* Give it some value != NULL */ | |
| 278 | |
| 279 #else | |
| 280 /* dlopening libdvdcss */ | |
| 281 | |
| 282 #ifdef __APPLE__ | |
| 283 #define CSS_LIB "libdvdcss.2.dylib" | |
| 284 #elif defined(WIN32) | |
| 84 | 285 #define CSS_LIB "libdvdcss-2.dll" |
| 30 | 286 #elif defined(__OS2__) |
| 287 #define CSS_LIB "dvdcss.dll" | |
| 3 | 288 #else |
| 289 #define CSS_LIB "libdvdcss.so.2" | |
| 290 #endif | |
| 291 dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); | |
| 292 | |
| 293 if(dvdcss_library != NULL) { | |
| 30 | 294 #if defined(__OpenBSD__) && !defined(__ELF__) || defined(__OS2__) |
| 3 | 295 #define U_S "_" |
| 296 #else | |
| 297 #define U_S | |
| 298 #endif | |
|
79
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
299 DVDcss_open = (dvdcss_t (*)(const char*)) |
| 3 | 300 dlsym(dvdcss_library, U_S "dvdcss_open"); |
|
79
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
301 DVDcss_close = (int (*)(dvdcss_t)) |
| 3 | 302 dlsym(dvdcss_library, U_S "dvdcss_close"); |
|
79
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
303 DVDcss_seek = (int (*)(dvdcss_t, int, int)) |
| 3 | 304 dlsym(dvdcss_library, U_S "dvdcss_seek"); |
|
79
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
305 DVDcss_read = (int (*)(dvdcss_t, void*, int, int)) |
| 3 | 306 dlsym(dvdcss_library, U_S "dvdcss_read"); |
|
79
dbfcd120bf24
Replace uses of the deprecated dvdcss_handle type by dvdcss_t.
diego
parents:
40
diff
changeset
|
307 DVDcss_error = (char* (*)(dvdcss_t)) |
| 3 | 308 dlsym(dvdcss_library, U_S "dvdcss_error"); |
| 20 | 309 |
| 3 | 310 if(dlsym(dvdcss_library, U_S "dvdcss_crack")) { |
| 20 | 311 fprintf(stderr, |
| 26 | 312 "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n" |
| 313 "libdvdread: You should get the latest version from " | |
| 314 "http://www.videolan.org/\n" ); | |
| 3 | 315 dlclose(dvdcss_library); |
| 316 dvdcss_library = NULL; | |
|
80
d59aaee50e47
Replace deprecated dvdcss_title() function by dvdcss_seek().
diego
parents:
79
diff
changeset
|
317 } else if(!DVDcss_open || !DVDcss_close || !DVDcss_seek |
|
81
7e9feef7a82d
Do not extract libdvdcss version via dvdcss_interface_2.
diego
parents:
80
diff
changeset
|
318 || !DVDcss_read || !DVDcss_error) { |
| 3 | 319 fprintf(stderr, "libdvdread: Missing symbols in %s, " |
| 26 | 320 "this shouldn't happen !\n", CSS_LIB); |
| 3 | 321 dlclose(dvdcss_library); |
| 322 } | |
| 323 } | |
| 324 #endif /* HAVE_DVDCSS_DVDCSS_H */ | |
| 20 | 325 |
| 3 | 326 if(dvdcss_library != NULL) { |
| 327 /* | |
| 328 char *psz_method = getenv( "DVDCSS_METHOD" ); | |
| 329 char *psz_verbose = getenv( "DVDCSS_VERBOSE" ); | |
| 330 fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method); | |
| 331 fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); | |
| 332 */ | |
| 20 | 333 |
| 3 | 334 /* libdvdcss wrapper functions */ |
| 335 dvdinput_open = css_open; | |
| 336 dvdinput_close = css_close; | |
| 337 dvdinput_seek = css_seek; | |
| 338 dvdinput_title = css_title; | |
| 339 dvdinput_read = css_read; | |
| 340 dvdinput_error = css_error; | |
| 341 return 1; | |
| 20 | 342 |
| 3 | 343 } else { |
| 344 fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n"); | |
| 345 | |
| 346 /* libdvdcss replacement functions */ | |
| 347 dvdinput_open = file_open; | |
| 348 dvdinput_close = file_close; | |
| 349 dvdinput_seek = file_seek; | |
| 350 dvdinput_title = file_title; | |
| 351 dvdinput_read = file_read; | |
| 352 dvdinput_error = file_error; | |
| 353 return 0; | |
| 354 } | |
| 355 } |
