Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/14538 ) Change subject: vty: Simplify char escaping in asciidoc output .. vty: Simplify char escaping in asciidoc output Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 --- M src/vty/command.c 1 file changed, 4 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/command.c b/src/vty/command.c index 89a2bc1..454a10c 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -515,7 +515,7 @@ { int _strlen; char *out, *out_ptr; - int len = 0, i, j; + int len = 0, i; if (!inp) return NULL; @@ -538,23 +538,18 @@ out_ptr = out; -#define ADD(out, str) \ - for (j = 0; j < strlen(str); ++j) \ - *(out++) = str[j]; - for (i = 0; i < _strlen; ++i) { switch (inp[i]) { case '|': - ADD(out_ptr, "\\|"); - break; + /* Prepend escape character "\": */ + *(out_ptr++) = '\\'; + /* fall through */ default: *(out_ptr++) = inp[i]; break; } } -#undef ADD - out_ptr[0] = '\0'; return out; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 Gerrit-Change-Number: 14538 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14538 ) Change subject: vty: Simplify char escaping in asciidoc output .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 Gerrit-Change-Number: 14538 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 25 Jun 2019 15:02:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14538 ) Change subject: vty: Simplify char escaping in asciidoc output .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 Gerrit-Change-Number: 14538 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 19 Jun 2019 16:55:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/14538 to look at the new patch set (#2). Change subject: vty: Simplify char escaping in asciidoc output .. vty: Simplify char escaping in asciidoc output Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 --- M src/vty/command.c 1 file changed, 4 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/14538/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 Gerrit-Change-Number: 14538 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/14538 Change subject: vty: Simplify char escaping in asciidoc output .. vty: Simplify char escaping in asciidoc output Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 --- M src/vty/command.c 1 file changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/14538/1 diff --git a/src/vty/command.c b/src/vty/command.c index 89a2bc1..d8e7f7f 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -538,23 +538,18 @@ out_ptr = out; -#define ADD(out, str) \ - for (j = 0; j < strlen(str); ++j) \ - *(out++) = str[j]; - for (i = 0; i < _strlen; ++i) { switch (inp[i]) { case '|': - ADD(out_ptr, "\\|"); - break; + /* Prepend escape character "\": */ + *(out_ptr++) = '\\'; + /* fall through */ default: *(out_ptr++) = inp[i]; break; } } -#undef ADD - out_ptr[0] = '\0'; return out; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 Gerrit-Change-Number: 14538 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange