> Date: Mon, 19 Apr 2010 14:51:42 +0200 (CEST) > From: Jose E. Marchesi <[email protected]> > > > Ok. Here is try 2 :-) > > + if (cpos<0){ > + return __pdf_fsys_disk_get_status_from_errno (errno); > + }else{ > + *pos = cpos; > + return PDF_OK; > + } > > Same problem with the codying style. Are you sure you sent the > right patch? >
Ah, sorry. It was late night :-) ## # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: file:///home/gerel/PROJECTS/libgnupdf/trunk/ # testament_sha1: 8cfe9348f5c8221688491e7a3c856965f169cf88 # timestamp: 2010-04-19 18:29:54 -0300 # base_revision_id: [email protected] # # Begin patch === modified file 'ChangeLog' --- ChangeLog 2010-04-18 11:13:22 +0000 +++ ChangeLog 2010-04-19 21:29:47 +0000 @@ -1,3 +1,8 @@ +2010-04-17 Gerardo E. Gidoni <[email protected]> + + Updated pdf_fsys_disk_file_set/get_pos to use fseek/ftell + * src/base/pdf-fsys-disk.c: changed fgetpos/fsetpos for ftell/fseek. + 2010-04-15 Jose E. Marchesi <[email protected]> Remove spurious blank lines before EOF in the codebase. === modified file 'src/base/pdf-fsys-disk.c' --- src/base/pdf-fsys-disk.c 2010-04-15 15:07:50 +0000 +++ src/base/pdf-fsys-disk.c 2010-04-19 21:28:18 +0000 @@ -1012,10 +1012,17 @@ if((file != NULL) && \ (pos != NULL)) { - return ((fgetpos(((pdf_fsys_disk_file_t)file->data)->file_descriptor, \ - (fpos_t*)pos) == 0) ? \ - PDF_OK : \ - __pdf_fsys_disk_get_status_from_errno(errno)); + long cpos; + cpos = ftell (((pdf_fsys_disk_file_t)file->data)->file_descriptor); + if (cpos<0) + { + return __pdf_fsys_disk_get_status_from_errno (errno); + } + else + { + *pos = cpos; + return PDF_OK; + } } else { @@ -1029,10 +1036,17 @@ { if(file != NULL) { - return ((fsetpos(((pdf_fsys_disk_file_t)file->data)->file_descriptor, \ - (fpos_t*)&new_pos) == 0) ? \ - PDF_OK : \ - __pdf_fsys_disk_get_status_from_errno(errno)); + int st; + st = fseek (((pdf_fsys_disk_file_t)file->data)->file_descriptor, + new_pos, SEEK_SET); + if (st < 0) + { + return __pdf_fsys_disk_get_status_from_errno (errno); + } + else + { + return PDF_OK; + } } else { # Begin bundle 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 ### -gerel
