octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-09-28 04:59:05 +00:00
Code Issues Releases Wiki Activity

more tweaking of C error interface

Browse Source 
git-svn-id: svn+q:///qpdf/trunk@894 71b93d88-0707-0410-a8cf-f5a4172ac649
This commit is contained in:
Jay Berkenbilt 2009-10-23 16:50:22 +00:00
parent cfc1f6fcac
commit b1702fb16c
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/qpdf/Constants.h
View File

@ -17,7 +17,8 @@
enum qpdf_error_code_e enum qpdf_error_code_e
{ {
qpdf_e_internal = 1, /* logic/programming error -- indicates bug */ qpdf_e_success = 0,
qpdf_e_internal, /* logic/programming error -- indicates bug */
qpdf_e_system, /* I/O error, memory error, etc. */ qpdf_e_system, /* I/O error, memory error, etc. */
qpdf_e_unsupported, /* PDF feature not (yet) supported by qpdf */ qpdf_e_unsupported, /* PDF feature not (yet) supported by qpdf */
qpdf_e_password, /* incorrect password for encrypted file */ qpdf_e_password, /* incorrect password for encrypted file */

3
include/qpdf/qpdf-c.h
View File

@ -142,8 +142,7 @@ extern "C" {
char const* qpdf_get_error_full_text(qpdf_data q, qpdf_error e); char const* qpdf_get_error_full_text(qpdf_data q, qpdf_error e);
/* Use these functions to extract individual fields from the /* Use these functions to extract individual fields from the
* error; see QPDFExc.hh for details. It is invalid for e to be a * error; see QPDFExc.hh for details. */
* null pointer for any of these calls. */
QPDF_DLL QPDF_DLL
enum qpdf_error_code_e qpdf_get_error_code(qpdf_data q, qpdf_error e); enum qpdf_error_code_e qpdf_get_error_code(qpdf_data q, qpdf_error e);
QPDF_DLL QPDF_DLL

20
libqpdf/qpdf-c.cc
View File

@ -166,26 +166,46 @@ qpdf_error qpdf_next_warning(qpdf_data qpdf)
char const* qpdf_get_error_full_text(qpdf_data qpdf, qpdf_error e) char const* qpdf_get_error_full_text(qpdf_data qpdf, qpdf_error e)
{ {
if (e == 0)
{
return "";
}
return e->exc.getPointer()->what(); return e->exc.getPointer()->what();
} }
enum qpdf_error_code_e qpdf_get_error_code(qpdf_data qpdf, qpdf_error e) enum qpdf_error_code_e qpdf_get_error_code(qpdf_data qpdf, qpdf_error e)
{ {
if (e == 0)
{
return qpdf_e_success;
}
return e->exc.getPointer()->getErrorCode(); return e->exc.getPointer()->getErrorCode();
} }
char const* qpdf_get_error_filename(qpdf_data qpdf, qpdf_error e) char const* qpdf_get_error_filename(qpdf_data qpdf, qpdf_error e)
{ {
if (e == 0)
{
return "";
}
return e->exc.getPointer()->getFilename().c_str(); return e->exc.getPointer()->getFilename().c_str();
} }
unsigned long qpdf_get_error_file_position(qpdf_data qpdf, qpdf_error e) unsigned long qpdf_get_error_file_position(qpdf_data qpdf, qpdf_error e)
{ {
if (e == 0)
{
return 0;
}
return e->exc.getPointer()->getFilePosition(); return e->exc.getPointer()->getFilePosition();
} }
char const* qpdf_get_error_message_detail(qpdf_data qpdf, qpdf_error e) char const* qpdf_get_error_message_detail(qpdf_data qpdf, qpdf_error e)
{ {
if (e == 0)
{
return "";
}
return e->exc.getPointer()->getMessageDetail().c_str(); return e->exc.getPointer()->getMessageDetail().c_str();
} }

11
qpdf/qpdf-ctest.c
View File

@ -18,15 +18,24 @@ static void report_errors()
printf(" pos : %ld\n", qpdf_get_error_file_position(qpdf, e)); printf(" pos : %ld\n", qpdf_get_error_file_position(qpdf, e));
printf(" text: %s\n", qpdf_get_error_message_detail(qpdf, e)); printf(" text: %s\n", qpdf_get_error_message_detail(qpdf, e));
} }
e = qpdf_get_error(qpdf);
if (qpdf_has_error(qpdf)) if (qpdf_has_error(qpdf))
{ {
e = qpdf_get_error(qpdf);
printf("error: %s\n", qpdf_get_error_full_text(qpdf, e)); printf("error: %s\n", qpdf_get_error_full_text(qpdf, e));
printf(" code: %d\n", qpdf_get_error_code(qpdf, e)); printf(" code: %d\n", qpdf_get_error_code(qpdf, e));
printf(" file: %s\n", qpdf_get_error_filename(qpdf, e)); printf(" file: %s\n", qpdf_get_error_filename(qpdf, e));
printf(" pos : %ld\n", qpdf_get_error_file_position(qpdf, e)); printf(" pos : %ld\n", qpdf_get_error_file_position(qpdf, e));
printf(" text: %s\n", qpdf_get_error_message_detail(qpdf, e)); printf(" text: %s\n", qpdf_get_error_message_detail(qpdf, e));
} }
else
{
assert(e == 0);
assert(qpdf_get_error_code(qpdf, e) == qpdf_e_success);
(void)qpdf_get_error_full_text(qpdf, e);
(void)qpdf_get_error_filename(qpdf, e);
(void)qpdf_get_error_file_position(qpdf, e);
(void)qpdf_get_error_message_detail(qpdf, e);
}
} }
static void test01(char const* infile, static void test01(char const* infile,