diff options
author | Lev Walkin <vlm@lionet.info> | 2006-08-18 02:27:55 +0000 |
---|---|---|
committer | Lev Walkin <vlm@lionet.info> | 2006-08-18 02:27:55 +0000 |
commit | c46b7cb50041897e2f6d617bdf23582d9462d4e5 (patch) | |
tree | 0b8e91f7da38399fa1aa3a7607e17a83441043b8 /libasn1compiler | |
parent | 5af1a6993b28abdb1b22e26d9145707d8c158713 (diff) |
*** empty log message ***
Diffstat (limited to 'libasn1compiler')
-rw-r--r-- | libasn1compiler/asn1c_C.c | 3 | ||||
-rw-r--r-- | libasn1compiler/asn1c_compat.c | 2 | ||||
-rw-r--r-- | libasn1compiler/asn1c_misc.c | 4 | ||||
-rw-r--r-- | libasn1compiler/asn1c_save.c | 21 |
4 files changed, 15 insertions, 15 deletions
diff --git a/libasn1compiler/asn1c_C.c b/libasn1compiler/asn1c_C.c index db9bab89..20492c07 100644 --- a/libasn1compiler/asn1c_C.c +++ b/libasn1compiler/asn1c_C.c @@ -1784,7 +1784,8 @@ emit_single_member_PER_constraint(arg_t *arg, asn1cnst_range_t *range, char *typ asn1c_integer_t cover = 1; asn1c_integer_t r = 1 + range->right.value - range->left.value; - int rbits, ebits; + size_t rbits; /* Value range bits */ + ssize_t ebits; /* Value effective range bits */ if(range->empty_constraint) r = 0; diff --git a/libasn1compiler/asn1c_compat.c b/libasn1compiler/asn1c_compat.c index b393d6d2..a6e65781 100644 --- a/libasn1compiler/asn1c_compat.c +++ b/libasn1compiler/asn1c_compat.c @@ -32,7 +32,7 @@ asn1c_open_file(const char *name, const char *ext, char **opt_tmpname) { fname = alloca(len); ret = snprintf(fname, len, "%s%s%s", name, ext, opt_tmpname ? ".XXXXXX" : ""); - assert(ret > 0 && ret < len); + assert(ret > 0 && ret < (ssize_t)len); if(opt_tmpname) { /* diff --git a/libasn1compiler/asn1c_misc.c b/libasn1compiler/asn1c_misc.c index f96b3896..742c02aa 100644 --- a/libasn1compiler/asn1c_misc.c +++ b/libasn1compiler/asn1c_misc.c @@ -20,7 +20,7 @@ static char *res_kwd[] = { }; static int reserved_keyword(const char *str) { - int i; + size_t i; for(i = 0 ; i < sizeof(res_kwd)/sizeof(res_kwd[0]); i++) { if(strcmp(str, res_kwd[i]) == 0) return 1; @@ -42,7 +42,7 @@ asn1c_make_identifier(enum ami_flags_e flags, asn1p_expr_t *expr, ...) { char *nextstr; char *first = 0; char *second = 0; - size_t size; + ssize_t size; char *p; if(expr) { diff --git a/libasn1compiler/asn1c_save.c b/libasn1compiler/asn1c_save.c index d54777f7..3fed83d5 100644 --- a/libasn1compiler/asn1c_save.c +++ b/libasn1compiler/asn1c_save.c @@ -6,13 +6,13 @@ #include "asn1c_save.h" #include "asn1c_out.h" -static int asn1c_dump_streams(arg_t *arg, asn1c_fdeps_t *, int, int, char **); +static int asn1c_dump_streams(arg_t *arg, asn1c_fdeps_t *, int, char **); static int asn1c_print_streams(arg_t *arg); -static int asn1c_save_streams(arg_t *arg, asn1c_fdeps_t *, int, int, char **); +static int asn1c_save_streams(arg_t *arg, asn1c_fdeps_t *, int, char **); static int asn1c_copy_over(arg_t *arg, char *path); static int identical_files(const char *fname1, const char *fname2); static int generate_pdu_collection_file(arg_t *arg); -static int generate_preamble(arg_t *, FILE *, int argc, int optc, char **argv); +static int generate_preamble(arg_t *, FILE *, int optc, char **argv); int asn1c_save_compiled_output(arg_t *arg, const char *datadir, @@ -33,8 +33,7 @@ asn1c_save_compiled_output(arg_t *arg, const char *datadir, TQ_FOR(arg->expr, &(mod->members), next) { if(asn1_lang_map[arg->expr->meta_type] [arg->expr->expr_type].type_cb) { - if(asn1c_dump_streams(arg, deps, - argc, optc, argv)) + if(asn1c_dump_streams(arg, deps, optc, argv)) return -1; } } @@ -155,11 +154,11 @@ asn1c_save_compiled_output(arg_t *arg, const char *datadir, * Dump the streams. */ static int -asn1c_dump_streams(arg_t *arg, asn1c_fdeps_t *deps, int argc, int optc, char **argv) { +asn1c_dump_streams(arg_t *arg, asn1c_fdeps_t *deps, int optc, char **argv) { if(arg->flags & A1C_PRINT_COMPILED) { return asn1c_print_streams(arg); } else { - return asn1c_save_streams(arg, deps, argc, optc, argv); + return asn1c_save_streams(arg, deps, optc, argv); } } @@ -187,7 +186,7 @@ asn1c_print_streams(arg_t *arg) { } static int -asn1c_save_streams(arg_t *arg, asn1c_fdeps_t *deps, int argc, int optc, char **argv) { +asn1c_save_streams(arg_t *arg, asn1c_fdeps_t *deps, int optc, char **argv) { asn1p_expr_t *expr = arg->expr; compiler_streams_t *cs = expr->data; out_chunk_t *ot; @@ -212,8 +211,8 @@ asn1c_save_streams(arg_t *arg, asn1c_fdeps_t *deps, int argc, int optc, char **a return -1; } - generate_preamble(arg, fp_c, argc, optc, argv); - generate_preamble(arg, fp_h, argc, optc, argv); + generate_preamble(arg, fp_c, optc, argv); + generate_preamble(arg, fp_h, optc, argv); header_id = asn1c_make_identifier(0, expr, NULL); fprintf(fp_h, @@ -303,7 +302,7 @@ asn1c_save_streams(arg_t *arg, asn1c_fdeps_t *deps, int argc, int optc, char **a } static int -generate_preamble(arg_t *arg, FILE *fp, int argc, int optc, char **argv) { +generate_preamble(arg_t *arg, FILE *fp, int optc, char **argv) { fprintf(fp, "/*\n" " * Generated by asn1c-" VERSION " (http://lionet.info/asn1c)\n" |