X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fgom_internal.h;h=d00ca74ed6217d894e9f541c612d477ede41d4f8;hb=98a195063839daba53508ac426fb39847f2150c4;hp=6950b6064b462cec2695ce7740f508b98f2fb082;hpb=bdf47fdee469d5a1d7ddfd06a0e4b26f3b40b0f4;p=gedcom-parse.git diff --git a/gom/gom_internal.h b/gom/gom_internal.h index 6950b60..d00ca74 100644 --- a/gom/gom_internal.h +++ b/gom/gom_internal.h @@ -36,6 +36,8 @@ #define _(string) gettext(string) #define N_(string) (string) +#define UNUSED __attribute__((unused)) + typedef enum { T_NULL, @@ -64,9 +66,10 @@ typedef struct Gom_ctxt_struct *Gom_ctxt; Gom_ctxt make_gom_ctxt(int ctxt_type, OBJ_TYPE obj_type, void *ctxt_ptr); void destroy_gom_ctxt(Gom_ctxt ctxt); -void gom_cast_error(char* file, int line, OBJ_TYPE expected, OBJ_TYPE found); -void gom_no_context(char* file, int line); -void gom_unexpected_context(char* file, int line, OBJ_TYPE found); +void gom_cast_error(const char* file, int line, + OBJ_TYPE expected, OBJ_TYPE found); +void gom_no_context(const char* file, int line); +void gom_unexpected_context(const char* file, int line, OBJ_TYPE found); #define MAKE_GOM_CTXT(CTXT_TYPE, STRUCTTYPE, CTXT_PTR) \ make_gom_ctxt(CTXT_TYPE, T_ ## STRUCTTYPE, CTXT_PTR) @@ -89,14 +92,14 @@ void gom_unexpected_context(char* file, int line, OBJ_TYPE found); #define NO_CONTEXT \ gom_no_context(__FILE__, __LINE__) -void gom_mem_error(char *filename, int line); +void gom_mem_error(const char *filename, int line); #define MEMORY_ERROR gom_mem_error(__FILE__, __LINE__) void def_rec_end(Gedcom_rec rec, Gedcom_ctxt self); -void def_elt_end(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self, - Gedcom_val parsed_value); -void set_xref_type(struct xref_value *xr, char* str); +void def_elt_end(Gedcom_elt elt, Gedcom_ctxt parent, + Gedcom_ctxt self, Gedcom_val parsed_value); +void set_xref_type(struct xref_value *xr, const char* str); typedef enum { WITHOUT_NL, @@ -151,11 +154,15 @@ void NULL_DESTROY(void* anything); } \ } -#define _REC_PARAMS_ Gedcom_rec rec, int level, Gedcom_val xref, char *tag, \ - char *raw_value, int parsed_tag, Gedcom_val parsed_value +#define _REC_PARAMS_ Gedcom_rec rec UNUSED, int level UNUSED, \ + Gedcom_val xref UNUSED, char *tag UNUSED, \ + char *raw_value UNUSED, int parsed_tag UNUSED, \ + Gedcom_val parsed_value UNUSED -#define _ELT_PARAMS_ Gedcom_elt elt, Gedcom_ctxt parent, int level, char *tag,\ - char *raw_value, int parsed_tag, Gedcom_val parsed_value +#define _ELT_PARAMS_ Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED, \ + int level UNUSED, char *tag UNUSED, \ + char *raw_value UNUSED, int parsed_tag UNUSED, \ + Gedcom_val parsed_value UNUSED #define REC_CB(STRUCTTYPE,CB_NAME,FUNC) \ Gedcom_ctxt CB_NAME(_REC_PARAMS_) \ @@ -170,7 +177,7 @@ void NULL_DESTROY(void* anything); } #define GET_REC_BY_XREF(STRUCTTYPE,XREF_TYPE,FUNC_NAME) \ - struct STRUCTTYPE *FUNC_NAME(char *xrefstr) \ + struct STRUCTTYPE *FUNC_NAME(const char *xrefstr) \ { \ struct xref_value* xr = gedcom_get_by_xref(xrefstr); \ if (xr && (xr->type == XREF_TYPE) && xr->object) \