Hi again, Well, this is an updated patch. Since the native/macros 64bit support returned PDF_ERROR when the built-in implementation returns PDF_EBAADDATA. After applying this patch, both implementations return PDF_EBADDATA.
## # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: file:///home/gerel/PROJECTS/libgnupdf/trunk/ # testament_sha1: f841372ab4f10f7323b4bc49f42d022eb5c5f05d # timestamp: 2010-03-30 11:12:41 -0300 # base_revision_id: [email protected] # # Begin patch === modified file 'ChangeLog' --- ChangeLog 2010-03-29 19:07:36 +0000 +++ ChangeLog 2010-03-30 14:12:35 +0000 @@ -1,3 +1,30 @@ +2010-03-30 Gerardo E. Gidoni <[email protected]> + + * src/base/pdf-types.h: corrected int64 macros return status + codes, PDF_EBADDATA should be returned instead of PDF_ERROR. + + * torture/unit/base/types/pdf-i64-abs.c: testing for invalid destination + (with NULL) should return PDF_EBADDATA instead of PDF_ERROR. + + * torture/unit/base/types/pdf-i64-add.c: likewise. + + * torture/unit/base/types/pdf-i64-assign-quick.c: likewise. + + * torture/unit/base/types/pdf-i64-assign.c: likewise. + + * torture/unit/base/types/pdf-i64-copy.c: likewise. + + * torture/unit/base/types/pdf-i64-div.c: likewise. + + * torture/unit/base/types/pdf-i64-mod.c: likewise. + + * torture/unit/base/types/pdf-i64-mult.c: likewise. + + * torture/unit/base/types/pdf-i64-neg.c: likewise. + + * torture/unit/base/types/pdf-i64-subtraction.c: likewise. + + 2010-03-29 Jose E. Marchesi <[email protected]> * configure.ac: Check if the available version of libcheck is not === modified file 'src/base/pdf-types.h' --- src/base/pdf-types.h 2010-02-22 20:00:09 +0000 +++ src/base/pdf-types.h 2010-03-30 14:12:35 +0000 @@ -283,7 +283,7 @@ { \ if (bignum == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -302,7 +302,7 @@ { \ if (bignum == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -317,7 +317,7 @@ { \ if (copy == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -332,7 +332,7 @@ { \ if (dest == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -351,7 +351,7 @@ { \ if (dest == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -366,7 +366,7 @@ { \ if (dest == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -381,7 +381,7 @@ { \ if (dest == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -396,7 +396,7 @@ { \ if (dest == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -411,7 +411,7 @@ { \ if (dest == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ @@ -426,7 +426,7 @@ { \ if (dest == NULL) \ { \ - *p_status = PDF_ERROR; \ + *p_status = PDF_EBADDATA; \ } \ else \ { \ === modified file 'torture/unit/base/types/pdf-i64-abs.c' --- torture/unit/base/types/pdf-i64-abs.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-abs.c 2010-03-30 13:24:41 +0000 @@ -110,7 +110,7 @@ fail_if(p_status != PDF_OK); pdf_i64_abs(dest, src , &p_status); - fail_unless(p_status == PDF_ERROR); + fail_unless(p_status == PDF_EBADDATA); } END_TEST === modified file 'torture/unit/base/types/pdf-i64-add.c' --- torture/unit/base/types/pdf-i64-add.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-add.c 2010-03-30 13:24:41 +0000 @@ -86,7 +86,7 @@ #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT pdf_i64_t *dest = NULL; pdf_i64_add(dest,add1,add2, &p_status); - fail_if(p_status != PDF_ERROR); + fail_if(p_status != PDF_EBADDATA); #endif === modified file 'torture/unit/base/types/pdf-i64-assign-quick.c' --- torture/unit/base/types/pdf-i64-assign-quick.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-assign-quick.c 2010-03-30 13:24:41 +0000 @@ -79,7 +79,7 @@ pdf_init(); pdf_i64_assign_quick(k,5,&p_status); - fail_if( p_status != PDF_ERROR); + fail_if( p_status != PDF_EBADDATA); #endif } === modified file 'torture/unit/base/types/pdf-i64-assign.c' --- torture/unit/base/types/pdf-i64-assign.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-assign.c 2010-03-30 13:24:41 +0000 @@ -80,7 +80,7 @@ pdf_init(); pdf_i64_assign(k,4,5,&p_status); - fail_if( p_status != PDF_ERROR); + fail_if( p_status != PDF_EBADDATA); #endif } === modified file 'torture/unit/base/types/pdf-i64-copy.c' --- torture/unit/base/types/pdf-i64-copy.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-copy.c 2010-03-30 13:24:41 +0000 @@ -87,7 +87,7 @@ #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT pdf_i64_t *copy = NULL; pdf_i64_copy(orig,copy,&p_status); - fail_if( p_status != PDF_ERROR); + fail_if( p_status != PDF_EBADDATA); #endif } === modified file 'torture/unit/base/types/pdf-i64-div.c' --- torture/unit/base/types/pdf-i64-div.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-div.c 2010-03-30 13:24:41 +0000 @@ -89,7 +89,7 @@ #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT pdf_i64_t *dest = NULL; pdf_i64_div(dest,div1,div2, &p_status); - fail_if(p_status != PDF_ERROR); + fail_if(p_status != PDF_EBADDATA); #endif === modified file 'torture/unit/base/types/pdf-i64-mod.c' --- torture/unit/base/types/pdf-i64-mod.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-mod.c 2010-03-30 13:24:41 +0000 @@ -89,7 +89,7 @@ #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT pdf_i64_t *dest = NULL; pdf_i64_mod(dest,mod1,mod2, &p_status); - fail_if(p_status != PDF_ERROR); + fail_if(p_status != PDF_EBADDATA); #endif @@ -187,7 +187,7 @@ fail_if(p_status != PDF_OK); pdf_i64_mod(dest, mod1, mod2, &p_status); - fail_unless(p_status == PDF_ERROR); + fail_unless(p_status == PDF_EBADDATA); } END_TEST === modified file 'torture/unit/base/types/pdf-i64-mult.c' --- torture/unit/base/types/pdf-i64-mult.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-mult.c 2010-03-30 13:24:41 +0000 @@ -89,7 +89,7 @@ #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT pdf_i64_t *dest = NULL; pdf_i64_mult(dest,mult1,mult2, &p_status); - fail_if(p_status != PDF_ERROR); + fail_if(p_status != PDF_EBADDATA); #endif === modified file 'torture/unit/base/types/pdf-i64-neg.c' --- torture/unit/base/types/pdf-i64-neg.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-neg.c 2010-03-30 13:24:41 +0000 @@ -120,7 +120,7 @@ fail_if(p_status != PDF_OK); pdf_i64_neg(dest, src , &p_status); - fail_unless(p_status == PDF_ERROR); + fail_unless(p_status == PDF_EBADDATA); } END_TEST === modified file 'torture/unit/base/types/pdf-i64-subtraction.c' --- torture/unit/base/types/pdf-i64-subtraction.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/types/pdf-i64-subtraction.c 2010-03-30 13:24:41 +0000 @@ -91,7 +91,7 @@ #ifndef PDF_USE_BUILTIN_64BIT_SUPPORT pdf_i64_t *dest = NULL; pdf_i64_subtraction(dest,subtraction1,subtraction2, &p_status); - fail_if(p_status != PDF_ERROR); + fail_if(p_status != PDF_EBADDATA); #endif # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaMCtacACk1/gEVw4CBwd/// f4XWBL////BgDPz32O7V2IAUAABQWmlQCSglFtrZlVUGVQyGIAMTQABoMjI0BoMgAHNMjIZMENGE wRpo0YgaZMjAAEOaZGQyYIaMJgjTRoxA0yZGAAIJNUIEp6mTZTaaQ09R6mgDQAADQGgBFImhGhkJ ip+1T00GoymyNTEZNBoAaPQgVKQABGhAEaJqnslPU9NTBHqMymj0jQ8o1b+GeESTl10Ifh49cCiW mzYbEVvNswoecghUD6/vruahto71OxS1ilm1pIWRxlUKho3MOPC+hXS2L6dOTAFa1K4nkCUpNua6 qbXUZKyqVrVlqpjfaws6yByWIoP6bfRFkjsM/hE/kS6UYCKoqikiIiMYuvGQm7n5rzETdRu0b2ml zS6lsboWb6XZYl0vFa4Ui3OLRo2rQqXVrbGt/w5sDC9vZRzIZMKsS1aVq00/c3oRiNWhoY1iQiCI BPSaioEiAgoQ9voj6ogWSIFKTXIKI9TXNGdV01beXr1V3WWCM6CXgcvIRGPRHPwpV5Ya36dlrWLU 4Dp7SF4HKjfnEDtqmOY5+fRmtbcODbxRMt0kV4uuE2PpyfDgpNT0iU17jxhiIE7TfApVYcJqwIag hYhZIQ0hfRF6WspVaqlnYmhmjgj3Po8fRJL01eYubT6lrF4CF7/HMhHwwuz9ny3X6o6d2mTYVEys oWFZYVkrJWUqpXSxNyo8Ud9YnTssu1KSlIyCRUJSQJhrdtyrLEkxAyhQlCGrfDzBOw9VSmsgRX0m BWpAq8FSRKskhUjNU81s0RSZRKLj8KS5YUpJD+z0XYK2bJzYM0Lql6HJCsynqiw0WURQsKxvKCpu rlUCxq72y+3UuwVQaVRq1Wr2ivNhYqqf2UUarVTRozZWM92T9lwqQ24NnWROVW8rk0zuSckkuv+j dImk5/Zg1fedPqWDKb4IWqmeNbBlzXTYUuflYtQ2wy7d3HDu619r13FzMozSTVqpEtbyck2guH/r hcvzvdy9G3W1nbhbRq2Wy39uXA7ffdMjRqxXsmijnEuytvcOjG9yZNlyt4eapYPj2H6pJ8jH0aVe fSrtp2UnOU0iwsL2jWzKkQ+2ERtE1reWCYGFdcwycNNXe6NPSzFFdPCitRVhUa2ClmsXmiSdzyrX 2mO6tRSYePBg1wwozYqGKGWUyb22kWWbrS5w44UtKmK1pq5I28WXOYYylKb4U0qpdbnfOhTBIerJ 6WtHXDJoqpq7aLr1LEk5sSvRVYokLWONdCySaqkWt9q+1iyoWO3S7hDhZoxZsamzUzaNjapThyV3 XO2TSt4n1z0HZ+jtzx4krb1bbUrpXSyzs2ymRKiKSOjCIw3dGiSWDVod7vxegyd9rJgryFOSvJJN B33ua31K2rTm1a9KLL5Je0eDYxrwqzWNTy6G0kucq1SVrWys6KObVirfp2pRmqqcNXa49JQ5liHf TjXkTGllKUst64WQwwL0O5b0b2IV4YYLJLnW7BwvVX4FfDOmbrbvbM67li0ZWtreqtd2ZKmrZe5I wZ2PIfEVTKjHelalFVWXHNsjVDNZZS312OHWxaz/WzXhx9nwIvbKhevVE0spy5G84ph5yo+Pjv2Y 9HZisbvV3B5LHZh1aObpcoybbOmmXE9p1kwva68Y0GSODrUdaHRf4NMsrhk6ZLFmLo4K0dL1daxa vs5OjnrStnba61NdHv+GKzVvJO9nBUr4qdNFTBRsdFbdvktXM5wjyQxdeXCDAulnvunWIbANBOQr AFV5MobqrIk8rXHKxdfsoqphSmms07NL+iq13VKqKL25c5NtsKTavda/vbdnC3xJOe0ZOjovnNl1 vvU6K22B9d7myqyUmyyX1sStOtaxWZWoVOHVXka3qbLKLl9eLfC9Rg1sYr2K1g4K2LTlW2Zt1xlU vaPQ+H0ST35Iw56qE3U0UllObRa6GdhegSVoVk0CCsiitghS0g+5T1CdsJqiJDyz5gbDPqixRGCn CUiozwyEoImpCJY7eR+6MjcLwQTf7VTrVP7VLtKxCwBEIR7AG4qVNap4oOj5qlvtJMF8Ja/D9b1d 5+qqEo2YrGKxnJGj9f+X9af1Pj8fifJBuOh0nEhSQmIEhDHyVCPwRKOHu8x3naStFeR3ExPbnIex kTEKFhBEysoV/Spb+5/L9imNVip+9z/F+JqvcmNSlf7Wf8F471EJqe/3Yo4lDcuPvwFq0gBuBwdJ EFEy5VTUf40Xuj09KvN+KFHko/zXXfg8FLPK6tezZ8lXVcv8lVen8ZGjT1XKmSnqZKmSx9965ly+ G7Zuzc83dguPyNj+JP9aJJ+KOtCPdu0s7dHi4dXCjf5Lm7Es6MFTrMNGa5a73i0xc0YSrUsVKKnb tWxdzqk+Pk8Vtafn55PbhSu5xQp8cKpWr7uX9KKKU73czdj19X1sfBa0e5s8Huc1r3KzPfF5Bjm0 YbQVMGq9uverFa2JKNWi29esUePhe3c3M6Ozor7O/5JG6+973ZbEPLgjn2chWDNArwR2UzcBKkYU mJzG80FeYvMDXYfjIjEqMhtJpbDGmK5lDE3G2UcDe3WFfMaHJ9In1xMdKN1CVNndEohi2UXPn223 ZO767fbDvU6Kl7s7/F4O9RR/u8HJgwdzVPOc2GVri6Rjs/0mFqCfUH8CyV7xhA47jj9LFErNvW9M KhOvVX757FWjWdfzFUh+cLCS59TEYJHz+fe9Hmter4PIo9H91bLLB7nvRflX8mrRayWu3zkegsXL vkxcs1bk0XyTRUqWsF7iSVpH6RPsibROHgPF7jX1ui5oZKl8+Yu8nn9VJSVFpEqO4+w0Hh2umTKU QoZvteoMKSSCTBLmdgHzVHtzidXg6uJAmgCc1ewV+hIKZqj0Bhzqu0ufM5wTpBMQvPsDF9Ln5En+ FS9JPaZrR7STkMIekjWSFw6o5CGqU3xjnNpQplICEDzodahrEl1mowDQWI4ed8ji6Bdvolzr1odw G8Q77RM4GdQzkzWwqlqnl4klQ2PDFCN5Q3itoZiZm9kUSTBak9oxidGhWYnZJPF3vmgr0RyMpJSo suyyKHJFEUgZ4S3OyKEC+20iw1UOFg1UNKM7isvIhHuFYGUIGAiySJXJr6/C09HLm/4dj6d6Kecv aCfa0ylhqYiHnVGST6qkChu9ZwLzUajsiA8RIZUIhGAcnIqqqqqqoqqqqqq0pdJMX/gnpt64O4fd ecvvR7DsU+KlrP2Ox9s7z94uQ+S77MJJzkbWSIrB3zh9FUkqNDlVHwAn3zT2Bc31bjoKq7CAbwIG apOyZFTNTAIF6hWKqiRhyQhSqekvhiFNYnJgMJCuJfMaRKUt2GMZCiu6Ip3EzKIRd3ETsodYZhJe DUSR7xG9BkK+E1br93NuSZs8nXxbGSzI96SVoYyNk7imUyUmgTJqa3IqchNfQR5RMpkRiIhRbOoz PHzOGT5GSPKX9yT7qSRmOD7ZhPBGkQwXOcQOORQ53B2gQtZHYJRDtyu0V7kk9jyFEOFh8kkwJLTY o6idkb4JPkL3/4u5IpwoSFGBWtOA ### -gerel
