diff options
author | Dave Beckett <dave@dajobe.org> | 2013-08-25 17:06:06 -0700 |
---|---|---|
committer | Dave Beckett <dave@dajobe.org> | 2013-08-25 17:06:44 -0700 |
commit | 18400915bdc4e221f42bc7c94573099c40808691 (patch) | |
tree | 1e4862f43badfef915f1f571ee33b13514f54365 | |
parent | 327b303d28c4de35754e920faa7242007016ac9f (diff) | |
download | raptor-18400915bdc4e221f42bc7c94573099c40808691.tar.gz |
Revert "(raptor_normalize_language): Added to normalize to en-US-BLAH"
This reverts commit 7b4788f656546be7abdd87122c03ea005e771c17.
-rw-r--r-- | src/ntriples_parse.c | 42 | ||||
-rw-r--r-- | src/raptor_internal.h | 2 |
2 files changed, 1 insertions, 43 deletions
diff --git a/src/ntriples_parse.c b/src/ntriples_parse.c index 84e62ed7..0e2da00a 100644 --- a/src/ntriples_parse.c +++ b/src/ntriples_parse.c @@ -256,12 +256,10 @@ raptor_ntriples_generate_statement(raptor_parser* parser, /* These are for 7-bit ASCII and not locale-specific */ #define IS_ASCII_ALPHA(c) (((c) > 0x40 && (c) < 0x5B) || ((c) > 0x60 && (c) < 0x7B)) -#define IS_ASCII_LOWER(c) ((c) > 0x60 && (c) < 0x7B) #define IS_ASCII_UPPER(c) ((c) > 0x40 && (c) < 0x5B) #define IS_ASCII_DIGIT(c) ((c) > 0x2F && (c) < 0x3A) #define IS_ASCII_PRINT(c) ((c) > 0x1F && (c) < 0x7F) -#define TO_ASCII_LOWER(c) ((c) + 0x20) -#define TO_ASCII_UPPER(c) ((c) - 0x20) +#define TO_ASCII_LOWER(c) ((c)+0x20) typedef enum { RAPTOR_TERM_CLASS_URI, /* ends on > */ @@ -537,44 +535,6 @@ raptor_ntriples_term(raptor_parser* rdf_parser, #define MAX_NTRIPLES_TERMS 4 -/* - * raptor_normalize_language: - * @language: language - * - * INTERNAL - Normalize language to lowercase - * - * http://www.w3.org/TR/rdf-concepts/#dfn-language-identifier - * - * Return value: non-0 if normalized - */ -int -raptor_normalize_language(char* language) -{ - char *p; - int seen_ = 0; - int normalized = 0; - - if(!language) - return 0; - - for(p = language; *p; p++) { - if(*p == '-') - seen_ ++; - else if(!seen_) { - if(IS_ASCII_UPPER(*p)) { - *p = TO_ASCII_LOWER(*p); - normalized = 1; - } - } else if(IS_ASCII_LOWER(*p)) { - *p = TO_ASCII_UPPER(*p); - normalized = 1; - } - } - - return normalized; -} - - static int raptor_ntriples_parse_line(raptor_parser* rdf_parser, unsigned char *buffer, size_t len, diff --git a/src/raptor_internal.h b/src/raptor_internal.h index cca1e451..4d19ad84 100644 --- a/src/raptor_internal.h +++ b/src/raptor_internal.h @@ -687,8 +687,6 @@ void raptor_stats_print(raptor_parser *rdf_parser, FILE *stream); RAPTOR_INTERNAL_API const char* raptor_basename(const char *name); int raptor_term_print_as_ntriples(const raptor_term *term, FILE* stream); -int raptor_normalize_language(char* language); - /* raptor_parse.c */ raptor_parser_factory* raptor_world_get_parser_factory(raptor_world* world, const char *name); void raptor_delete_parser_factories(void); |