Change in ...libosmo-netif[master]: osmux: osmux_snprintf(): Append comma between osmux frames in msg

2019-10-04 Thread laforge 
laforge has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/c/libosmo-netif/+/15667 )

Change subject: osmux: osmux_snprintf(): Append comma between osmux frames in 
msg
..

osmux: osmux_snprintf(): Append comma between osmux frames in msg

Change-Id: I7acaba9429466db6cb5700b206d6b42da5e4627a
---
M src/osmux.c
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/osmux.c b/src/osmux.c
index 8b6a115..43b294c 100644
--- a/src/osmux.c
+++ b/src/osmux.c
@@ -1093,7 +1093,10 @@
return -1;
}
osmuxh = (struct osmux_hdr *)((uint8_t *)msg->data + msg_off);
-
+   if (msg_off) {
+   ret = snprintf(buf + offset, remain, ", ");
+   SNPRINTF_BUFFER_SIZE(ret, remain, offset);
+   }
ret = osmux_snprintf_header(buf + offset, remain, osmuxh);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);


--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15667
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I7acaba9429466db6cb5700b206d6b42da5e4627a
Gerrit-Change-Number: 15667
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-MessageType: merged

Change in ...libosmo-netif[master]: osmux: osmux_snprintf(): Append comma between osmux frames in msg

2019-10-04 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/libosmo-netif/+/15667 )

Change subject: osmux: osmux_snprintf(): Append comma between osmux frames in 
msg
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15667
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I7acaba9429466db6cb5700b206d6b42da5e4627a
Gerrit-Change-Number: 15667
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Fri, 04 Oct 2019 11:50:34 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in ...libosmo-netif[master]: osmux: osmux_snprintf(): Append comma between osmux frames in msg

2019-10-04 Thread pespin 
pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/libosmo-netif/+/15667


Change subject: osmux: osmux_snprintf(): Append comma between osmux frames in 
msg
..

osmux: osmux_snprintf(): Append comma between osmux frames in msg

Change-Id: I7acaba9429466db6cb5700b206d6b42da5e4627a
---
M src/osmux.c
1 file changed, 4 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/67/15667/1

diff --git a/src/osmux.c b/src/osmux.c
index 8b6a115..43b294c 100644
--- a/src/osmux.c
+++ b/src/osmux.c
@@ -1093,7 +1093,10 @@
return -1;
}
osmuxh = (struct osmux_hdr *)((uint8_t *)msg->data + msg_off);
-
+   if (msg_off) {
+   ret = snprintf(buf + offset, remain, ", ");
+   SNPRINTF_BUFFER_SIZE(ret, remain, offset);
+   }
ret = osmux_snprintf_header(buf + offset, remain, osmuxh);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);


--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15667
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I7acaba9429466db6cb5700b206d6b42da5e4627a
Gerrit-Change-Number: 15667
Gerrit-PatchSet: 1
Gerrit-Owner: pespin 
Gerrit-MessageType: newchange