Re: [pdf-devel] Patch for FS#114

[gerel]

 > Date: Mon, 19 Apr 2010 14:51:42 +0200 (CEST)
 > From: Jose E. Marchesi <address@hidden>
 > 
 >     
 >     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?

BTW, here is the trunk-updated  one.
cheers,

##
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/gerel/PROJECTS/libgnupdf/trunk/
# testament_sha1: 10fd3cc37b51e3b69c6c8584f275de74e2a8316c
# timestamp: 2010-04-19 18:46:50 -0300
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog   2010-04-19 21:14:16 +0000
+++ ChangeLog   2010-04-19 21:43:35 +0000
@@ -1,3 +1,8 @@
+2010-04-19  Gerardo E. Gidoni  <address@hidden>
+
+       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-19  Jose E. Marchesi  <address@hidden>
 
        Skip sc_cross_check_PATH_usage_in_tests in make syntax-check.

=== 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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
T8bkLeYTlxGF5J3+A/xdyRThQkOZKf90

###

-gerel