Changeset 2131
- Timestamp:
- 04/15/08 23:35:08 (1 month ago)
- Files:
-
- libswish3/trunk/src/libswish3/parser.c (modified) (4 diffs)
- libswish3/trunk/src/swish_lint.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
libswish3/trunk/src/libswish3/parser.c
r2130 r2131 55 55 extern int SWISH_DEBUG; 56 56 57 int SWISH_PARSER_ERROR = 0; 58 int SWISH_PARSER_WARNING = 0; 59 int SWISH_PARSER_FATAL = 0; 57 // should we pass on libxml2 via SWISH_WARN() 58 int SWISH_PARSER_WARNINGS = 0; 60 59 61 60 static void get_env_vars( … … 847 846 static void 848 847 myerr( 849 void * user_data,848 void *data, 850 849 xmlChar *msg, 851 850 ... 852 851 ) 853 852 { 854 if (!SWISH_PARSER_ERROR) 855 return; 856 857 if (!SWISH_PARSER_FATAL) 858 return; 859 860 SWISH_WARN("libxml2 error:"); 861 853 swish_ParserData *parser_data; 862 854 va_list args; 863 855 char str[1000]; 864 swish_ParserData *parser_data = (swish_ParserData *)user_data; 865 856 857 if (!SWISH_PARSER_WARNINGS) 858 return; 859 860 parser_data = (swish_ParserData *)data; 861 862 SWISH_WARN("libxml2 error for %s:", parser_data->docinfo->uri); 863 866 864 va_start(args, msg); 867 865 vsnprintf((char *)str, 1000, (char *)msg, args); 868 866 xmlParserError(parser_data->ctxt, (char *)str); 869 867 va_end(args); 870 871 /*872 * SWISH_WARN("end libxml2 error");873 */874 868 } 875 869 … … 884 878 ) 885 879 { 886 if (!SWISH_PARSER_WARNING) 887 return; 888 889 SWISH_WARN("libxml2 warning:"); 890 880 swish_ParserData *parser_data; 891 881 va_list args; 892 882 char str[1000]; 893 swish_ParserData *parser_data = (swish_ParserData *)user_data; 894 883 884 if (!SWISH_PARSER_WARNINGS) 885 return; 886 887 parser_data = (swish_ParserData *)user_data; 888 889 SWISH_WARN("libxml2 warning for %s:", parser_data->docinfo->uri); 890 895 891 va_start(args, msg); 896 892 vsnprintf((char *)str, 1000, (char *)msg, args); … … 1459 1455 */ 1460 1456 1461 setenv("SWISH_PARSER_ERROR", "0", 0); 1462 SWISH_PARSER_ERROR = swish_string_to_int(getenv("SWISH_PARSER_ERROR")); 1463 1464 setenv("SWISH_PARSER_WARNING", "0", 0); 1465 SWISH_PARSER_WARNING = swish_string_to_int(getenv("SWISH_PARSER_WARNING")); 1466 1467 setenv("SWISH_PARSER_FATAL", "0", 0); 1468 SWISH_PARSER_FATAL = swish_string_to_int(getenv("SWISH_PARSER_FATAL")); 1457 setenv("SWISH_PARSER_WARNINGS", "0", 0); 1458 SWISH_PARSER_WARNINGS = swish_string_to_int(getenv("SWISH_PARSER_WARNINGS")); 1469 1459 1470 1460 if (SWISH_DEBUG) { 1471 SWISH_PARSER_ERROR = SWISH_DEBUG; 1472 SWISH_PARSER_WARNING = SWISH_DEBUG; 1473 SWISH_PARSER_FATAL = SWISH_DEBUG; 1461 SWISH_PARSER_WARNINGS = SWISH_DEBUG; 1474 1462 } 1475 1463 } libswish3/trunk/src/swish_lint.c
r2129 r2131 62 62 ) 63 63 { 64 printf(" libxml2 version:%s\n", LIBXML_DOTTED_VERSION);64 printf(" libxml2 version:\t%s\n", LIBXML_DOTTED_VERSION); 65 65 } 66 66 … … 69 69 ) 70 70 { 71 printf("libswish3 version 72 printf(" swish version%s\n", SWISH_VERSION);71 printf("libswish3 version:\t%s\n", SWISH_LIB_VERSION); 72 printf(" swish version:\t%s\n", SWISH_VERSION); 73 73 } 74 74 … … 91 91 printf("\tSWISH_DEBUG_MEMORY 32\n"); 92 92 printf("\tSWISH_DEBUG_NAMEDBUFFER 64\n"); 93 printf("Set SWISH_PARSER_WARNINGS=1 to see libxml2 errors and warnings\n"); 93 94 printf("stdin headers:\n"); 94 95 printf("\tContent-Length\n");
