[pdf-devel] libgnupdf/torture/unit/base/types pdf-i64-abs.c...

[Daniel]

CVSROOT:        /cvsroot/pdf
Module name:    libgnupdf
Changes by:     Daniel <danividal>      08/07/09 12:06:53

Modified files:
        torture/unit/base/types: pdf-i64-abs.c pdf-i64-add.c 
                                 pdf-i64-assign-quick.c pdf-i64-assign.c 
                                 pdf-i64-cmp.c pdf-i64-copy.c 
                                 pdf-i64-neg.c 

Log message:
        Changed pdf_i64 functions to conform to new API

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libgnupdf/torture/unit/base/types/pdf-i64-abs.c?cvsroot=pdf&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libgnupdf/torture/unit/base/types/pdf-i64-add.c?cvsroot=pdf&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/libgnupdf/torture/unit/base/types/pdf-i64-assign-quick.c?cvsroot=pdf&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libgnupdf/torture/unit/base/types/pdf-i64-assign.c?cvsroot=pdf&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libgnupdf/torture/unit/base/types/pdf-i64-cmp.c?cvsroot=pdf&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libgnupdf/torture/unit/base/types/pdf-i64-copy.c?cvsroot=pdf&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libgnupdf/torture/unit/base/types/pdf-i64-neg.c?cvsroot=pdf&r1=1.1&r2=1.2

Patches:
Index: pdf-i64-abs.c
===================================================================
RCS file: /cvsroot/pdf/libgnupdf/torture/unit/base/types/pdf-i64-abs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pdf-i64-abs.c       24 Jun 2008 12:09:50 -0000      1.1
+++ pdf-i64-abs.c       9 Jul 2008 12:06:52 -0000       1.2
@@ -42,18 +42,19 @@
  */
 START_TEST(pdf_i64_abs_001)
 {
-
+  pdf_status_t p_status = PDF_OK;
   int cmp_res;
   pdf_i64_t k,j;
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT
-  pdf_i64_assign(&k,0xFFFFFFFF,0xFFFFFFFE); /*-2*/
-  fail_if(pdf_i64_abs( &j, k ) != PDF_OK);
+  pdf_i64_assign(&k,0xFFFFFFFF,0xFFFFFFFE, &p_status); /*-2*/
+  pdf_i64_abs( &j, k , &p_status);
+  fail_if(p_status != PDF_OK);
   fail_if(j.high != 0);
   fail_if(j.low != 2);
 #else
   k = -2;
-  pdf_i64_abs( &j, k );
+  pdf_i64_abs( &j, k , &p_status);
   fail_if(j != 2);
 #endif
 
@@ -76,18 +77,19 @@
 
 START_TEST(pdf_i64_abs_002)
 {
-  
+  pdf_status_t p_status = PDF_OK;
   int cmp_res;
   pdf_i64_t k,j;
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT
-  pdf_i64_assign(&k,0,2); /*2*/
-  fail_if(pdf_i64_abs( &j, k ) != PDF_OK);
+  pdf_i64_assign(&k,0,2, &p_status); /*2*/
+  pdf_i64_abs( &j, k , &p_status);
+  fail_if(p_status != PDF_OK);
   fail_if(j.high != 0);
   fail_if(j.low != 2);
 #else
   k = 2;
-  pdf_i64_abs( &j, k );
+  pdf_i64_abs( &j, k , &p_status);
   fail_if(j != 2);
 #endif
 

Index: pdf-i64-add.c
===================================================================
RCS file: /cvsroot/pdf/libgnupdf/torture/unit/base/types/pdf-i64-add.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- pdf-i64-add.c       24 Jun 2008 12:08:54 -0000      1.5
+++ pdf-i64-add.c       9 Jul 2008 12:06:52 -0000       1.6
@@ -42,7 +42,7 @@
  */
 START_TEST(pdf_i64_add_001)
 {
-
+  pdf_status_t p_status = PDF_OK;
   pdf_i64_t add1,add2,dest;
   add1 = pdf_i64_new(0,0xFFFFFFFF);
   add2 = pdf_i64_new(2147483646,1);
@@ -53,11 +53,12 @@
  
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT  
-  fail_if(pdf_i64_add(&dest,add1,add2) != PDF_OK);
+  pdf_i64_add(&dest,add1,add2, &p_status);
+  fail_if(p_status != PDF_OK);
   fail_if(dest.low != 0);
   fail_if(dest.high != 2147483647);
 #else
-  pdf_i64_add(&dest,add1,add2);
+  pdf_i64_add(&dest,add1,add2, &p_status);
   fail_if(dest != 0x7FFFFFFF00000000);
 #endif
 
@@ -75,16 +76,18 @@
 
 START_TEST(pdf_i64_add_002)
 {
-  
+  pdf_status_t p_status = PDF_OK;
   pdf_i64_t add1,add2;
-  pdf_i64_t *dest = NULL;
+  
   add1 = pdf_i64_new(0,4);
   add2 = pdf_i64_new(5,0);
 
   
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT  
-  fail_if(pdf_i64_add(dest,add1,add2) != PDF_ERROR);
+  pdf_i64_t *dest = NULL;
+  pdf_i64_add(dest,add1,add2, &p_status); 
+  fail_if(p_status != PDF_ERROR);
 #endif
   
   
@@ -100,22 +103,22 @@
  */
 START_TEST(pdf_i64_add_003)
 {
-
+  pdf_status_t p_status = PDF_OK;
   pdf_i64_t add1, add2, dest;
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT 
   add1 = pdf_i64_new(0xFFFFFFFF,0xFFFFFFFE); /*-2*/
   add2 = pdf_i64_new(0,3);
+  pdf_i64_add(&dest, add1, add2, &p_status);
 
-  
-  fail_if(pdf_i64_add(&dest, add1, add2) != PDF_OK);
+  fail_if(p_status != PDF_OK);
   
   fail_if(dest.low != 1);
   fail_if(dest.high != 0);
 #else
   add1 = -2;
   add2 = 3;
-  pdf_i64_add(&dest, add1, add2);
+  pdf_i64_add(&dest, add1, add2, &p_status);
   fail_if(dest != 1);
 #endif
  
@@ -136,20 +139,21 @@
 {
 
   pdf_i64_t add1, add2, dest;
-
+  pdf_status_t p_status = PDF_OK;
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT 
   add1 = pdf_i64_new(0xFFFFFFFF,0xFFFFFFFE); /*-2*/
   add2 = pdf_i64_new(0xFFFFFFFF,0xFFFFFFFE); /*-2*/
 
+  pdf_i64_add(&dest, add1, add2, &p_status);
   
-  fail_if(pdf_i64_add(&dest, add1, add2) != PDF_OK);
+  fail_if(p_status != PDF_OK);
   
   fail_if(dest.low !=  0xFFFFFFFC); /*-4*/
   fail_if(dest.high != 0xFFFFFFFF);
 #else
   add1 = -2;
   add2 = -2;
-  pdf_i64_add(&dest, add1, add2);
+  pdf_i64_add(&dest, add1, add2, &p_status);
   fail_if(dest != -4);
 #endif
 

Index: pdf-i64-assign-quick.c
===================================================================
RCS file: 
/cvsroot/pdf/libgnupdf/torture/unit/base/types/pdf-i64-assign-quick.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pdf-i64-assign-quick.c      24 Jun 2008 12:08:54 -0000      1.4
+++ pdf-i64-assign-quick.c      9 Jul 2008 12:06:52 -0000       1.5
@@ -45,14 +45,15 @@
 {
 
   pdf_i64_t k;
-
+  pdf_status_t p_status = PDF_OK;
  
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT 
-  fail_if(pdf_i64_assign_quick(&k,5) != PDF_OK);  
+  pdf_i64_assign_quick(&k,5,&p_status);
+  fail_if(p_status != PDF_OK);  
   fail_if(k.low != 5);
   fail_if(k.high != 0);
 #else
-  pdf_i64_assign_quick(&k,5);
+  pdf_i64_assign_quick(&k,5,&p_status);
   fail_if(k != 5);
 #endif
 
@@ -69,10 +70,12 @@
  */
 START_TEST(pdf_i64_assign_quick_002)
 {
+  pdf_status_t p_status = PDF_OK;
 
-  pdf_i64_t* k = NULL;
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT 
-  fail_if(pdf_i64_assign_quick(k,5) != PDF_ERROR);
+  pdf_i64_t* k = NULL;
+  pdf_i64_assign_quick(k,5,&p_status);
+  fail_if( p_status != PDF_ERROR);
 #endif
   
 }

Index: pdf-i64-assign.c
===================================================================
RCS file: /cvsroot/pdf/libgnupdf/torture/unit/base/types/pdf-i64-assign.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pdf-i64-assign.c    24 Jun 2008 12:08:54 -0000      1.4
+++ pdf-i64-assign.c    9 Jul 2008 12:06:52 -0000       1.5
@@ -45,14 +45,15 @@
 {
 
   pdf_i64_t k;
-
+  pdf_status_t p_status = PDF_OK;
   
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT
-  fail_if( (pdf_i64_assign(&k,4,5)) != PDF_OK);
+  pdf_i64_assign(&k,4,5,&p_status);
+  fail_if( p_status != PDF_OK);
   fail_if(k.low != 5);
   fail_if(k.high != 4);
 #else
-  pdf_i64_assign(&k,4,5);
+  pdf_i64_assign(&k,4,5,&p_status);
   fail_if(k != 0x400000005);
 #endif
 
@@ -70,10 +71,12 @@
  */
 START_TEST(pdf_i64_assign_002)
 {
+  pdf_status_t p_status = PDF_OK;
 
-  pdf_i64_t* k = NULL;
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT
-  fail_if(pdf_i64_assign(k,4,5) != PDF_ERROR);
+  pdf_i64_t* k = NULL;
+  pdf_i64_assign(k,4,5,&p_status);
+  fail_if( p_status != PDF_ERROR);
 #endif
   
 }

Index: pdf-i64-cmp.c
===================================================================
RCS file: /cvsroot/pdf/libgnupdf/torture/unit/base/types/pdf-i64-cmp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pdf-i64-cmp.c       24 Jun 2008 12:09:50 -0000      1.1
+++ pdf-i64-cmp.c       9 Jul 2008 12:06:52 -0000       1.2
@@ -43,11 +43,11 @@
  */
 START_TEST(pdf_i64_cmp_001)
 {
-
+  pdf_status_t p_status = PDF_OK;
   int cmp_res;
   pdf_i64_t k,j;
-  pdf_i64_assign(&k,0xFFFFFFFF,0xFFFFFFFE); /*-2*/
-  pdf_i64_assign(&j,0,2); /*2*/
+  pdf_i64_assign(&k,0xFFFFFFFF,0xFFFFFFFE,&p_status); /*-2*/
+  pdf_i64_assign(&j,0,2,&p_status); /*2*/
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT
   cmp_res = pdf_i64_cmp( k, j );
@@ -71,11 +71,11 @@
 
 START_TEST(pdf_i64_cmp_002)
 {
-  
+  pdf_status_t p_status = PDF_OK;
   int cmp_res;
   pdf_i64_t k,j;
-  pdf_i64_assign(&k,0xFFFFFFFF,0xFFFFFFFE); /*-2*/
-  pdf_i64_assign(&j,0,2); /*2*/
+  pdf_i64_assign(&k,0xFFFFFFFF,0xFFFFFFFE,&p_status); /*-2*/
+  pdf_i64_assign(&j,0,2,&p_status); /*2*/
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT
   cmp_res = pdf_i64_cmp( j, k );
@@ -95,11 +95,11 @@
  */
 START_TEST(pdf_i64_cmp_003)
 {
-  
+  pdf_status_t p_status = PDF_OK;
   int cmp_res;
   pdf_i64_t k,j;
-  pdf_i64_assign(&k,0,2); /*2*/
-  pdf_i64_assign(&j,0,2); /*2*/
+  pdf_i64_assign(&k,0,2,&p_status); /*2*/
+  pdf_i64_assign(&j,0,2,&p_status); /*2*/
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT
   cmp_res = pdf_i64_cmp( j, k );

Index: pdf-i64-copy.c
===================================================================
RCS file: /cvsroot/pdf/libgnupdf/torture/unit/base/types/pdf-i64-copy.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pdf-i64-copy.c      24 Jun 2008 12:08:54 -0000      1.4
+++ pdf-i64-copy.c      9 Jul 2008 12:06:52 -0000       1.5
@@ -41,7 +41,7 @@
  */
 START_TEST(pdf_i64_copy_001)
 {
-
+  pdf_status_t p_status = PDF_OK;
   pdf_i64_t orig;
   pdf_i64_t copy;
   
@@ -51,11 +51,12 @@
   
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT 
-  fail_if(pdf_i64_copy(orig,&copy) != PDF_OK);
+  pdf_i64_copy(orig,&copy,&p_status);
+  fail_if( p_status != PDF_OK);
   fail_if(copy.low != 5);
   fail_if(copy.high != 4);
 #else
-  pdf_i64_copy(orig,&copy);
+  pdf_i64_copy(orig,&copy,&p_status);
   fail_if(copy != 0x0000000400000005);
 #endif
   
@@ -73,14 +74,16 @@
 
 START_TEST(pdf_i64_copy_002)
 {
-  
+  pdf_status_t p_status = PDF_OK;
   pdf_i64_t orig;
-  pdf_i64_t *copy = NULL;
+  
   
   orig = pdf_i64_new(4,5);
   
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT 
-  fail_if(pdf_i64_copy(orig,copy) != PDF_ERROR);
+  pdf_i64_t *copy = NULL;
+  pdf_i64_copy(orig,copy,&p_status);
+  fail_if( p_status != PDF_ERROR);
 #endif
   
 }

Index: pdf-i64-neg.c
===================================================================
RCS file: /cvsroot/pdf/libgnupdf/torture/unit/base/types/pdf-i64-neg.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pdf-i64-neg.c       24 Jun 2008 12:09:50 -0000      1.1
+++ pdf-i64-neg.c       9 Jul 2008 12:06:52 -0000       1.2
@@ -42,19 +42,20 @@
  */
 START_TEST(pdf_i64_neg_001)
 {
-
+  pdf_status_t p_status = PDF_OK;
   int cmp_res;
   pdf_i64_t k,j;
 
-  pdf_i64_assign(&k,0,2); /*2*/
+  pdf_i64_assign(&k,0,2,&p_status); /*2*/
   
 
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT 
-  fail_if(pdf_i64_neg( &j, k ) != PDF_OK);
+  pdf_i64_neg( &j, k ,&p_status);
+  fail_if( p_status != PDF_OK);
   fail_if(j.high != 0xFFFFFFFF);
   fail_if(j.low != 0xFFFFFFFE);
 #else
-  pdf_i64_neg( &j, k );
+  pdf_i64_neg( &j, k ,&p_status);
   fail_if(j != -2);
 #endif
   
@@ -74,20 +75,21 @@
 
 START_TEST(pdf_i64_neg_002)
 {
-  
-int cmp_res;
+  pdf_status_t p_status = PDF_OK;
+  int cmp_res;
   pdf_i64_t k,j;
-  pdf_i64_assign(&k,0xFFFFFFFF,0xFFFFFFFE); /*-2*/
+  pdf_i64_assign(&k,0xFFFFFFFF,0xFFFFFFFE,&p_status); /*-2*/
 
   
   
  
 #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT 
-  fail_if(pdf_i64_neg( &j, k ) != PDF_OK);  
+  pdf_i64_neg( &j, k ,&p_status); 
+  fail_if( p_status != PDF_OK);  
   fail_if(j.high != 0);
   fail_if(j.low != 2);
 #else
-  pdf_i64_neg( &j, k );
+  pdf_i64_neg( &j, k, &p_status );
   fail_if(j != 2);
 #endif