Commit c9a78477 authored by Lev Walkin's avatar Lev Walkin

No commit message

No commit message
parent fcb0efb0
...@@ -43,7 +43,6 @@ enum enctype { ...@@ -43,7 +43,6 @@ enum enctype {
AS_PER, AS_PER,
AS_DER, AS_DER,
AS_XER, AS_XER,
AS_CXER,
}; };
static void static void
...@@ -69,10 +68,6 @@ save_object_as(PDU_t *st, enum enctype how) { ...@@ -69,10 +68,6 @@ save_object_as(PDU_t *st, enum enctype how) {
rval = xer_encode(&asn_DEF_PDU, st, XER_F_BASIC, rval = xer_encode(&asn_DEF_PDU, st, XER_F_BASIC,
_buf_writer, 0); _buf_writer, 0);
break; break;
case AS_CXER:
rval = xer_encode(&asn_DEF_PDU, st, XER_F_CANONICAL,
_buf_writer, 0);
break;
} }
if (rval.encoded == -1) { if (rval.encoded == -1) {
...@@ -127,6 +122,9 @@ load_object_from(const char *fname, char *fbuf, int size, enum enctype how, int ...@@ -127,6 +122,9 @@ load_object_from(const char *fname, char *fbuf, int size, enum enctype how, int
fbuf_chunk < fbuf_left fbuf_chunk < fbuf_left
? fbuf_chunk : fbuf_left); ? fbuf_chunk : fbuf_left);
break; break;
case AS_DER:
assert(0);
break;
case AS_PER: case AS_PER:
rval = uper_decode(0, &asn_DEF_PDU, rval = uper_decode(0, &asn_DEF_PDU,
(void **)&st, fbuf + fbuf_offset, (void **)&st, fbuf + fbuf_offset,
...@@ -157,7 +155,7 @@ load_object_from(const char *fname, char *fbuf, int size, enum enctype how, int ...@@ -157,7 +155,7 @@ load_object_from(const char *fname, char *fbuf, int size, enum enctype how, int
if((mustfail?1:0) == (rval.code == RC_FAIL)) { if((mustfail?1:0) == (rval.code == RC_FAIL)) {
if(mustfail) { if(mustfail) {
fprintf(stderr, "-> (this was expected failure)\n"); fprintf(stderr, "-> (this was expected failure)\n");
return; return 0;
} }
} else { } else {
fprintf(stderr, "-> (unexpected %s)\n", mustfail ? "success" : "failure"); fprintf(stderr, "-> (unexpected %s)\n", mustfail ? "success" : "failure");
...@@ -281,7 +279,7 @@ compare_with_data_out(const char *fname, char *buf, int size) { ...@@ -281,7 +279,7 @@ compare_with_data_out(const char *fname, char *buf, int size) {
load_object_from(outName, fbuf, rd, AS_PER, mustfail); load_object_from(outName, fbuf, rd, AS_PER, mustfail);
if(mustfail) return; if(mustfail) return;
assert(rd == size); assert(rd == (size_t)size);
assert(memcmp(fbuf, buf, rd) == 0); assert(memcmp(fbuf, buf, rd) == 0);
fprintf(stderr, "XER->PER recoding .in->.out match.\n"); fprintf(stderr, "XER->PER recoding .in->.out match.\n");
} }
...@@ -290,7 +288,6 @@ compare_with_data_out(const char *fname, char *buf, int size) { ...@@ -290,7 +288,6 @@ compare_with_data_out(const char *fname, char *buf, int size) {
static void static void
process_XER_data(const char *fname, char *fbuf, int size) { process_XER_data(const char *fname, char *fbuf, int size) {
PDU_t *st; PDU_t *st;
int ret;
st = load_object_from(fname, fbuf, size, AS_XER, 0); st = load_object_from(fname, fbuf, size, AS_XER, 0);
if(!st) return; if(!st) return;
...@@ -320,7 +317,6 @@ static int ...@@ -320,7 +317,6 @@ static int
process(const char *fname) { process(const char *fname) {
char fbuf[4096]; char fbuf[4096];
char *ext = strrchr(fname, '.'); char *ext = strrchr(fname, '.');
int ret;
int rd; int rd;
FILE *fp; FILE *fp;
...@@ -336,7 +332,7 @@ process(const char *fname) { ...@@ -336,7 +332,7 @@ process(const char *fname) {
rd = fread(fbuf, 1, sizeof(fbuf), fp); rd = fread(fbuf, 1, sizeof(fbuf), fp);
fclose(fp); fclose(fp);
assert(rd < sizeof(fbuf)); /* expect small files */ assert((size_t)rd < sizeof(fbuf)); /* expect small files */
process_XER_data(fname, fbuf, rd); process_XER_data(fname, fbuf, rd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment