Omit version field in patty_print_frame_header()

This commit is contained in:
XANTRONIX Development 2020-08-04 20:54:43 -04:00 committed by XANTRONIX Industrial
parent c7a51ff7f1
commit 6b603b6048

View file

@ -31,16 +31,6 @@ static char *frame_type(enum patty_ax25_frame_type type) {
return "unknown"; return "unknown";
} }
static char *version(enum patty_ax25_version version) {
switch (version) {
case PATTY_AX25_2_0: return "v2.0";
case PATTY_AX25_2_2: return "v2.2";
case PATTY_AX25_OLD: return "old";
}
return "unknown";
}
static char *frame_cr(enum patty_ax25_frame_cr cr) { static char *frame_cr(enum patty_ax25_frame_cr cr) {
switch (cr) { switch (cr) {
case PATTY_AX25_FRAME_COMMAND: return "cmd"; case PATTY_AX25_FRAME_COMMAND: return "cmd";
@ -97,9 +87,8 @@ int patty_print_frame_header(FILE *fh,
} }
if (PATTY_AX25_FRAME_CONTROL_I(frame->control)) { if (PATTY_AX25_FRAME_CONTROL_I(frame->control)) {
if (fprintf(fh, " (%s %s %s N(R)=%d N(S)=%d P/F=%d info=%zu)", if (fprintf(fh, " (%s %s N(R)=%d N(S)=%d P/F=%d info=%zu)",
frame_type(frame->type), frame_type(frame->type),
version(frame->version),
frame_cr(frame->cr), frame_cr(frame->cr),
(int)frame->nr, (int)frame->nr,
(int)frame->ns, (int)frame->ns,
@ -108,9 +97,8 @@ int patty_print_frame_header(FILE *fh,
goto error_io; goto error_io;
} }
} else if (PATTY_AX25_FRAME_CONTROL_U(frame->control)) { } else if (PATTY_AX25_FRAME_CONTROL_U(frame->control)) {
if (fprintf(fh, " (%s %s %s P/F=%d", if (fprintf(fh, " (%s %s P/F=%d",
frame_type(frame->type), frame_type(frame->type),
version(frame->version),
frame_cr(frame->cr), frame_cr(frame->cr),
(int)frame->pf) < 0) { (int)frame->pf) < 0) {
goto error_io; goto error_io;
@ -126,9 +114,8 @@ int patty_print_frame_header(FILE *fh,
goto error_io; goto error_io;
} }
} else if (PATTY_AX25_FRAME_CONTROL_S(frame->control)) { } else if (PATTY_AX25_FRAME_CONTROL_S(frame->control)) {
if (fprintf(fh, " (%s %s %s N(R)=%d P/F=%d)", if (fprintf(fh, " (%s %s N(R)=%d P/F=%d)",
frame_type(frame->type), frame_type(frame->type),
version(frame->version),
frame_cr(frame->cr), frame_cr(frame->cr),
(int)frame->nr, (int)frame->nr,
(int)frame->pf) < 0) { (int)frame->pf) < 0) {