X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fcpphash.h;h=1c5015173e0d87ad0d7c988abe6c40c2920dd580;hb=e2585cd835ae2dfa42f12b9ff4bbb56d339a83c9;hp=61027f2dfaa169c052e0b771b0b0b3cfe21b01fc;hpb=878d9b471c6ad92360ad9afa57fcb2a614e52830;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/cpphash.h b/gcc/cpphash.h index 61027f2dfaa..1c5015173e0 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -1,5 +1,5 @@ /* Part of CPP library. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -25,11 +25,29 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "hashtable.h" +#if defined HAVE_ICONV_H && defined HAVE_ICONV +#include +#else +#define HAVE_ICONV 0 +typedef int iconv_t; /* dummy */ +#endif + struct directive; /* Deliberately incomplete. */ struct pending_option; struct op; +struct _cpp_strbuf; +typedef bool (*convert_f) (iconv_t, const unsigned char *, size_t, + struct _cpp_strbuf *); +struct cset_converter +{ + convert_f func; + iconv_t cd; +}; + +#ifndef HAVE_UCHAR typedef unsigned char uchar; +#endif #define U (const uchar *) /* Intended use: U"string" */ #define BITS_PER_CPPCHAR_T (CHAR_BIT * sizeof (cppchar_t)) @@ -43,9 +61,16 @@ typedef unsigned char uchar; #define CPP_OPTION(PFILE, OPTION) ((PFILE)->opts.OPTION) #define CPP_BUFFER(PFILE) ((PFILE)->buffer) -#define CPP_BUF_COLUMN(BUF, CUR) ((CUR) - (BUF)->line_base + (BUF)->col_adjust) +#define CPP_BUF_COLUMN(BUF, CUR) ((CUR) - (BUF)->line_base) #define CPP_BUF_COL(BUF) CPP_BUF_COLUMN(BUF, (BUF)->cur) +#define CPP_INCREMENT_LINE(PFILE, COLS_HINT) do { \ + const struct line_maps *line_table = PFILE->line_table; \ + const struct line_map *map = &line_table->maps[line_table->used-1]; \ + unsigned int line = SOURCE_LINE (map, line_table->highest_line); \ + linemap_line_start (PFILE->line_table, line + 1, COLS_HINT); \ + } while (0) + /* Maximum nesting of cpp_buffers. We use a static limit, partly for efficiency, and partly to limit runaway recursion. */ #define CPP_STACK_MAX 200 @@ -82,7 +107,7 @@ struct cpp_macro } exp; /* Definition line number. */ - unsigned int line; + fileline line; /* Number of tokens in expansion, or bytes for traditional macros. */ unsigned int count; @@ -99,7 +124,7 @@ struct cpp_macro /* If macro defined in system header. */ unsigned int syshdr : 1; - /* Non-zero if it has been expanded or had its existence tested. */ + /* Nonzero if it has been expanded or had its existence tested. */ unsigned int used : 1; }; @@ -115,39 +140,18 @@ struct _cpp_buff unsigned char *base, *cur, *limit; }; -extern _cpp_buff *_cpp_get_buff PARAMS ((cpp_reader *, size_t)); -extern void _cpp_release_buff PARAMS ((cpp_reader *, _cpp_buff *)); -extern void _cpp_extend_buff PARAMS ((cpp_reader *, _cpp_buff **, size_t)); -extern _cpp_buff *_cpp_append_extend_buff PARAMS ((cpp_reader *, _cpp_buff *, - size_t)); -extern void _cpp_free_buff PARAMS ((_cpp_buff *)); -extern unsigned char *_cpp_aligned_alloc PARAMS ((cpp_reader *, size_t)); -extern unsigned char *_cpp_unaligned_alloc PARAMS ((cpp_reader *, size_t)); +extern _cpp_buff *_cpp_get_buff (cpp_reader *, size_t); +extern void _cpp_release_buff (cpp_reader *, _cpp_buff *); +extern void _cpp_extend_buff (cpp_reader *, _cpp_buff **, size_t); +extern _cpp_buff *_cpp_append_extend_buff (cpp_reader *, _cpp_buff *, size_t); +extern void _cpp_free_buff (_cpp_buff *); +extern unsigned char *_cpp_aligned_alloc (cpp_reader *, size_t); +extern unsigned char *_cpp_unaligned_alloc (cpp_reader *, size_t); #define BUFF_ROOM(BUFF) (size_t) ((BUFF)->limit - (BUFF)->cur) #define BUFF_FRONT(BUFF) ((BUFF)->cur) #define BUFF_LIMIT(BUFF) ((BUFF)->limit) -/* List of directories to look for include files in. */ -struct search_path -{ - struct search_path *next; - - /* NOTE: NAME may not be null terminated for the case of the current - file's directory! */ - const char *name; - unsigned int len; - /* We use these to tell if the directory mentioned here is a duplicate - of an earlier directory on the search path. */ - ino_t ino; - dev_t dev; - /* Non-zero if it is a system include directory. */ - int sysp; - /* Mapping of file names for this directory. Only used on MS-DOS - and related platforms. */ - struct file_name_map *name_map; -}; - /* #include types. */ enum include_type {IT_INCLUDE, IT_INCLUDE_NEXT, IT_IMPORT, IT_CMDLINE}; @@ -212,6 +216,11 @@ struct lexer_state /* Nonzero if first token on line is CPP_HASH. */ unsigned char in_directive; + /* Nonzero if in a directive that will handle padding tokens itself. + #include needs this to avoid problems with computed include and + spacing between tokens. */ + unsigned char directive_wants_padding; + /* True if we are skipping a failed conditional group. */ unsigned char skipping; @@ -225,9 +234,6 @@ struct lexer_state all directives apart from #define. */ unsigned char save_comments; - /* Nonzero if we're mid-comment. */ - unsigned char lexing_comment; - /* Nonzero if lexing __VA_ARGS__ is valid. */ unsigned char va_args_ok; @@ -253,74 +259,73 @@ struct spec_nodes cpp_hashnode *n__VA_ARGS__; /* C99 vararg macros */ }; -/* Encapsulates state used to convert a stream of tokens into a text - file. */ -struct printer +typedef struct _cpp_line_note _cpp_line_note; +struct _cpp_line_note { - FILE *outf; /* Stream to write to. */ - const struct line_map *map; /* Logical to physical line mappings. */ - const cpp_token *prev; /* Previous token. */ - const cpp_token *source; /* Source token for spacing. */ - unsigned int line; /* Line currently being written. */ - unsigned char printed; /* Nonzero if something output at line. */ + /* Location in the clean line the note refers to. */ + const uchar *pos; + + /* Type of note. The 9 'from' trigraph characters represent those + trigraphs, '\\' an escaped newline, ' ' an escaped newline with + intervening space, and anything else is invalid. */ + unsigned int type; }; /* Represents the contents of a file cpplib has read in. */ struct cpp_buffer { - const unsigned char *cur; /* current position */ - const unsigned char *backup_to; /* if peeked character is not wanted */ - const unsigned char *rlimit; /* end of valid data */ - const unsigned char *line_base; /* start of current line */ + const uchar *cur; /* Current location. */ + const uchar *line_base; /* Start of current physical line. */ + const uchar *next_line; /* Start of to-be-cleaned logical line. */ - struct cpp_buffer *prev; + const uchar *buf; /* Entire character buffer. */ + const uchar *rlimit; /* Writable byte at end of file. */ - const unsigned char *buf; /* Entire character buffer. */ + _cpp_line_note *notes; /* Array of notes. */ + unsigned int cur_note; /* Next note to process. */ + unsigned int notes_used; /* Number of notes. */ + unsigned int notes_cap; /* Size of allocated array. */ + + struct cpp_buffer *prev; - /* Pointer into the include table; non-NULL if this is a file - buffer. Used for include_next and to record control macros. */ - struct include_file *inc; + /* Pointer into the file table; non-NULL if this is a file buffer. + Used for include_next and to record control macros. */ + struct _cpp_file *file; /* Value of if_stack at start of this file. Used to prohibit unmatched #endif (etc) in an include file. */ struct if_stack *if_stack; - /* Token column position adjustment owing to tabs in whitespace. */ - unsigned int col_adjust; - - /* Contains PREV_WHITE and/or AVOID_LPASTE. */ - unsigned char saved_flags; - - /* Because of the way the lexer works, -Wtrigraphs can sometimes - warn twice for the same trigraph. This helps prevent that. */ - const unsigned char *last_Wtrigraphs; + /* True if we need to get the next clean line. */ + bool need_line; /* True if we have already warned about C++ comments in this file. The warning happens only for C89 extended mode with -pedantic on, or for -Wtraditional, and only once per file (otherwise it would be far too noisy). */ - unsigned char warned_cplusplus_comments; + unsigned int warned_cplusplus_comments : 1; /* True if we don't process trigraphs and escaped newlines. True for preprocessed input, command line directives, and _Pragma buffers. */ - unsigned char from_stage3; - - /* Nonzero means that the directory to start searching for "" - include files has been calculated and stored in "dir" below. */ - unsigned char search_cached; + unsigned int from_stage3 : 1; /* At EOF, a buffer is automatically popped. If RETURN_AT_EOF is true, a CPP_EOF token is then returned. Otherwise, the next token from the enclosing buffer is returned. */ - bool return_at_eof; + unsigned int return_at_eof : 1; + + /* One for a system header, two for a C system header file that therefore + needs to be extern "C" protected in C++, and zero otherwise. */ + unsigned char sysp; /* The directory of the this buffer's file. Its NAME member is not allocated, so we don't need to worry about freeing it. */ - struct search_path dir; + struct cpp_dir dir; - /* Used for buffer overlays by cpptrad.c. */ - const uchar *saved_cur, *saved_rlimit; + /* Descriptor for converting from the input character set to the + source character set. */ + struct cset_converter input_cset_desc; }; /* A cpp_reader encapsulates the "state" of a pre-processor run. @@ -338,12 +343,10 @@ struct cpp_reader struct lexer_state state; /* Source line tracking. */ - struct line_maps line_maps; - const struct line_map *map; - unsigned int line; + struct line_maps *line_table; /* The line of the '#' of the current directive. */ - unsigned int directive_line; + fileline directive_line; /* Memory buffers. */ _cpp_buff *a_buff; /* Aligned permanent storage. */ @@ -357,12 +360,30 @@ struct cpp_reader /* If in_directive, the directive if known. */ const struct directive *directive; - /* The next -include-d file; NULL if they all are done. If it - points to NULL, the last one is in progress, and - _cpp_maybe_push_include_file has yet to restore the line map. */ - struct pending_option **next_include_file; + /* Search paths for include files. */ + struct cpp_dir *quote_include; /* "" */ + struct cpp_dir *bracket_include; /* <> */ + struct cpp_dir no_search_path; /* No path. */ + + /* Chain of all hashed _cpp_file instances. */ + struct _cpp_file *all_files; + + struct _cpp_file *main_file; + + /* File and directory hash table. */ + struct htab *file_hash; + struct file_hash_entry *file_hash_entries; + unsigned int file_hash_entries_allocated, file_hash_entries_used; + + /* Nonzero means don't look for #include "foo" the source-file + directory. */ + bool quote_ignores_source_dir; - /* Multiple inlcude optimisation. */ + /* Nonzero if any file has contained #pragma once or #import has + been used. */ + bool seen_once_only; + + /* Multiple include optimization. */ const cpp_hashnode *mi_cmacro; const cpp_hashnode *mi_ind_cmacro; bool mi_valid; @@ -372,7 +393,7 @@ struct cpp_reader tokenrun base_run, *cur_run; unsigned int lookaheads; - /* Non-zero prevents the lexer from re-using the token runs. */ + /* Nonzero prevents the lexer from re-using the token runs. */ unsigned int keep_tokens; /* Error counter for exit code. */ @@ -382,15 +403,13 @@ struct cpp_reader unsigned char *macro_buffer; unsigned int macro_buffer_len; - /* Tree of other included files. See cppfiles.c. */ - struct splay_tree_s *all_include_files; - - /* Current maximum length of directory names in the search path - for include files. (Altered as we get more of them.) */ - unsigned int max_include_len; + /* Descriptor for converting from the source character set to the + execution character set. */ + struct cset_converter narrow_cset_desc; - /* Macros on or after this line are warned about if unused. */ - unsigned int first_unused_line; + /* Descriptor for converting from the source character set to the + wide execution character set. */ + struct cset_converter wide_cset_desc; /* Date and time text. Calculated together if either is requested. */ const uchar *date; @@ -415,7 +434,7 @@ struct cpp_reader list of recognized pragmas. */ struct pragma_entry *pragmas; - /* Call backs. */ + /* Call backs to cpplib client. */ struct cpp_callbacks cb; /* Identifier hash table. */ @@ -431,11 +450,8 @@ struct cpp_reader preprocessor. */ struct spec_nodes spec_nodes; - /* Used when doing preprocessed output. */ - struct printer print; - /* Whether cpplib owns the hashtable. */ - unsigned char our_hashtable; + bool our_hashtable; /* Traditional preprocessing output buffer (a logical line). */ struct @@ -443,12 +459,15 @@ struct cpp_reader uchar *base; uchar *limit; uchar *cur; - unsigned int first_line; + fileline first_line; } out; - /* Used to save the original line number during traditional - preprocessing. */ - unsigned int saved_line; + /* Used for buffer overlays by cpptrad.c. */ + const uchar *saved_cur, *saved_rlimit, *saved_line_base; + + /* A saved list of the defined macros, for dependency checking + of precompiled headers. */ + struct cpp_savedstate *savedstate; }; /* Character classes. Based on the more primitive macros in safe-ctype.h. @@ -480,86 +499,101 @@ extern unsigned char _cpp_trigraph_map[UCHAR_MAX + 1]; /* Macros. */ -#define CPP_IN_SYSTEM_HEADER(PFILE) ((PFILE)->map && (PFILE)->map->sysp) +static inline int cpp_in_system_header (cpp_reader *); +static inline int +cpp_in_system_header (cpp_reader *pfile) +{ + return pfile->buffer ? pfile->buffer->sysp : 0; +} #define CPP_PEDANTIC(PF) CPP_OPTION (PF, pedantic) #define CPP_WTRADITIONAL(PF) CPP_OPTION (PF, warn_traditional) /* In cpperror.c */ -extern int _cpp_begin_message PARAMS ((cpp_reader *, int, - unsigned int, unsigned int)); +extern int _cpp_begin_message (cpp_reader *, int, + source_location, unsigned int); /* In cppmacro.c */ -extern void _cpp_free_definition PARAMS ((cpp_hashnode *)); -extern bool _cpp_create_definition PARAMS ((cpp_reader *, cpp_hashnode *)); -extern void _cpp_pop_context PARAMS ((cpp_reader *)); -extern void _cpp_push_text_context PARAMS ((cpp_reader *, cpp_hashnode *, - const uchar *, size_t)); -extern bool _cpp_save_parameter PARAMS ((cpp_reader *, cpp_macro *, - cpp_hashnode *)); -extern bool _cpp_arguments_ok PARAMS ((cpp_reader *, cpp_macro *, - const cpp_hashnode *, - unsigned int)); -extern const uchar *_cpp_builtin_macro_text PARAMS ((cpp_reader *, - cpp_hashnode *)); -int _cpp_warn_if_unused_macro PARAMS ((cpp_reader *, cpp_hashnode *, - void *)); +extern void _cpp_free_definition (cpp_hashnode *); +extern bool _cpp_create_definition (cpp_reader *, cpp_hashnode *); +extern void _cpp_pop_context (cpp_reader *); +extern void _cpp_push_text_context (cpp_reader *, cpp_hashnode *, + const uchar *, size_t); +extern bool _cpp_save_parameter (cpp_reader *, cpp_macro *, cpp_hashnode *); +extern bool _cpp_arguments_ok (cpp_reader *, cpp_macro *, const cpp_hashnode *, + unsigned int); +extern const uchar *_cpp_builtin_macro_text (cpp_reader *, cpp_hashnode *); +int _cpp_warn_if_unused_macro (cpp_reader *, cpp_hashnode *, void *); /* In cpphash.c */ -extern void _cpp_init_hashtable PARAMS ((cpp_reader *, hash_table *)); -extern void _cpp_destroy_hashtable PARAMS ((cpp_reader *)); +extern void _cpp_init_hashtable (cpp_reader *, hash_table *); +extern void _cpp_destroy_hashtable (cpp_reader *); /* In cppfiles.c */ -extern void _cpp_fake_include PARAMS ((cpp_reader *, const char *)); -extern void _cpp_never_reread PARAMS ((struct include_file *)); -extern char *_cpp_simplify_pathname PARAMS ((char *)); -extern bool _cpp_read_file PARAMS ((cpp_reader *, const char *)); -extern bool _cpp_execute_include PARAMS ((cpp_reader *, - const cpp_token *, - enum include_type)); -extern int _cpp_compare_file_date PARAMS ((cpp_reader *, - const cpp_token *)); -extern void _cpp_report_missing_guards PARAMS ((cpp_reader *)); -extern void _cpp_init_includes PARAMS ((cpp_reader *)); -extern void _cpp_cleanup_includes PARAMS ((cpp_reader *)); -extern void _cpp_pop_file_buffer PARAMS ((cpp_reader *, - struct include_file *)); +typedef struct _cpp_file _cpp_file; +extern _cpp_file *_cpp_find_file (cpp_reader *, const char *fname, + cpp_dir *start_dir, bool fake); +extern bool _cpp_find_failed (_cpp_file *); +extern void _cpp_mark_file_once_only (cpp_reader *, struct _cpp_file *); +extern void _cpp_fake_include (cpp_reader *, const char *); +extern bool _cpp_stack_file (cpp_reader *, _cpp_file*, bool); +extern bool _cpp_stack_include (cpp_reader *, const char *, int, + enum include_type); +extern int _cpp_compare_file_date (cpp_reader *, const char *, int); +extern void _cpp_report_missing_guards (cpp_reader *); +extern void _cpp_init_files (cpp_reader *); +extern void _cpp_cleanup_files (cpp_reader *); +extern void _cpp_pop_file_buffer (cpp_reader *, struct _cpp_file *); +extern bool _cpp_save_file_entries (cpp_reader *pfile, FILE *f); +extern bool _cpp_read_file_entries (cpp_reader *, FILE *); /* In cppexp.c */ -extern bool _cpp_parse_expr PARAMS ((cpp_reader *)); -extern struct op *_cpp_expand_op_stack PARAMS ((cpp_reader *)); +extern bool _cpp_parse_expr (cpp_reader *); +extern struct op *_cpp_expand_op_stack (cpp_reader *); /* In cpplex.c */ -extern cpp_token *_cpp_temp_token PARAMS ((cpp_reader *)); -extern const cpp_token *_cpp_lex_token PARAMS ((cpp_reader *)); -extern cpp_token *_cpp_lex_direct PARAMS ((cpp_reader *)); -extern int _cpp_equiv_tokens PARAMS ((const cpp_token *, - const cpp_token *)); -extern void _cpp_init_tokenrun PARAMS ((tokenrun *, unsigned int)); +extern void _cpp_process_line_notes (cpp_reader *, int); +extern void _cpp_clean_line (cpp_reader *); +extern bool _cpp_get_fresh_line (cpp_reader *); +extern bool _cpp_skip_block_comment (cpp_reader *); +extern cpp_token *_cpp_temp_token (cpp_reader *); +extern const cpp_token *_cpp_lex_token (cpp_reader *); +extern cpp_token *_cpp_lex_direct (cpp_reader *); +extern int _cpp_equiv_tokens (const cpp_token *, const cpp_token *); +extern void _cpp_init_tokenrun (tokenrun *, unsigned int); /* In cppinit.c. */ -extern void _cpp_maybe_push_include_file PARAMS ((cpp_reader *)); +extern void _cpp_maybe_push_include_file (cpp_reader *); /* In cpplib.c */ -extern int _cpp_test_assertion PARAMS ((cpp_reader *, unsigned int *)); -extern int _cpp_handle_directive PARAMS ((cpp_reader *, int)); -extern void _cpp_define_builtin PARAMS ((cpp_reader *, const char *)); -extern void _cpp_do__Pragma PARAMS ((cpp_reader *)); -extern void _cpp_init_directives PARAMS ((cpp_reader *)); -extern void _cpp_init_internal_pragmas PARAMS ((cpp_reader *)); -extern void _cpp_do_file_change PARAMS ((cpp_reader *, enum lc_reason, - const char *, - unsigned int, unsigned int)); -extern void _cpp_pop_buffer PARAMS ((cpp_reader *)); +extern int _cpp_test_assertion (cpp_reader *, unsigned int *); +extern int _cpp_handle_directive (cpp_reader *, int); +extern void _cpp_define_builtin (cpp_reader *, const char *); +extern char ** _cpp_save_pragma_names (cpp_reader *); +extern void _cpp_restore_pragma_names (cpp_reader *, char **); +extern void _cpp_do__Pragma (cpp_reader *); +extern void _cpp_init_directives (cpp_reader *); +extern void _cpp_init_internal_pragmas (cpp_reader *); +extern void _cpp_do_file_change (cpp_reader *, enum lc_reason, const char *, + unsigned int, unsigned int); +extern void _cpp_pop_buffer (cpp_reader *); /* In cpptrad.c. */ -extern bool _cpp_read_logical_line_trad PARAMS ((cpp_reader *)); -extern void _cpp_overlay_buffer PARAMS ((cpp_reader *pfile, const uchar *, - size_t)); -extern void _cpp_remove_overlay PARAMS ((cpp_reader *)); -extern bool _cpp_create_trad_definition PARAMS ((cpp_reader *, cpp_macro *)); -extern bool _cpp_expansions_different_trad PARAMS ((const cpp_macro *, - const cpp_macro *)); -extern uchar *_cpp_copy_replacement_text PARAMS ((const cpp_macro *, uchar *)); -extern size_t _cpp_replacement_text_len PARAMS ((const cpp_macro *)); +extern bool _cpp_scan_out_logical_line (cpp_reader *, cpp_macro *); +extern bool _cpp_read_logical_line_trad (cpp_reader *); +extern void _cpp_overlay_buffer (cpp_reader *pfile, const uchar *, size_t); +extern void _cpp_remove_overlay (cpp_reader *); +extern bool _cpp_create_trad_definition (cpp_reader *, cpp_macro *); +extern bool _cpp_expansions_different_trad (const cpp_macro *, + const cpp_macro *); +extern uchar *_cpp_copy_replacement_text (const cpp_macro *, uchar *); +extern size_t _cpp_replacement_text_len (const cpp_macro *); + +/* In cppcharset.c. */ +extern cppchar_t _cpp_valid_ucn (cpp_reader *, const uchar **, + const uchar *, int); +extern void _cpp_destroy_iconv (cpp_reader *); +extern uchar *_cpp_convert_input (cpp_reader *, const char *, uchar *, + size_t, size_t, off_t *); +extern const char *_cpp_default_encoding (void); /* Utility routines and macros. */ #define DSC(str) (const uchar *)str, sizeof str - 1 @@ -571,55 +605,45 @@ extern size_t _cpp_replacement_text_len PARAMS ((const cpp_macro *)); /* These are inline functions instead of macros so we can get type checking. */ -static inline int ustrcmp PARAMS ((const uchar *, const uchar *)); -static inline int ustrncmp PARAMS ((const uchar *, const uchar *, - size_t)); -static inline size_t ustrlen PARAMS ((const uchar *)); -static inline uchar *uxstrdup PARAMS ((const uchar *)); -static inline uchar *ustrchr PARAMS ((const uchar *, int)); -static inline int ufputs PARAMS ((const uchar *, FILE *)); +static inline int ustrcmp (const uchar *, const uchar *); +static inline int ustrncmp (const uchar *, const uchar *, size_t); +static inline size_t ustrlen (const uchar *); +static inline uchar *uxstrdup (const uchar *); +static inline uchar *ustrchr (const uchar *, int); +static inline int ufputs (const uchar *, FILE *); static inline int -ustrcmp (s1, s2) - const uchar *s1, *s2; +ustrcmp (const uchar *s1, const uchar *s2) { return strcmp ((const char *)s1, (const char *)s2); } static inline int -ustrncmp (s1, s2, n) - const uchar *s1, *s2; - size_t n; +ustrncmp (const uchar *s1, const uchar *s2, size_t n) { return strncmp ((const char *)s1, (const char *)s2, n); } static inline size_t -ustrlen (s1) - const uchar *s1; +ustrlen (const uchar *s1) { return strlen ((const char *)s1); } static inline uchar * -uxstrdup (s1) - const uchar *s1; +uxstrdup (const uchar *s1) { return (uchar *) xstrdup ((const char *)s1); } static inline uchar * -ustrchr (s1, c) - const uchar *s1; - int c; +ustrchr (const uchar *s1, int c) { return (uchar *) strchr ((const char *)s1, c); } static inline int -ufputs (s, f) - const uchar *s; - FILE *f; +ufputs (const uchar *s, FILE *f) { return fputs ((const char *)s, f); }