You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/09/21 15:36:35 UTC
[2/3] qpid-proton git commit: NO-JIRA: c examples - clean up argv
handling
NO-JIRA: c examples - clean up argv handling
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d341350c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d341350c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d341350c
Branch: refs/heads/master
Commit: d341350cd520582013e4635f0422b324847d32d2
Parents: be614a1
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Sep 21 11:26:02 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Sep 21 11:27:58 2017 -0400
----------------------------------------------------------------------
examples/c/broker.c | 5 ++---
examples/c/receive.c | 11 +++++------
examples/c/send.c | 11 +++++------
3 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d341350c/examples/c/broker.c
----------------------------------------------------------------------
diff --git a/examples/c/broker.c b/examples/c/broker.c
index e0d9672..866a4c9 100644
--- a/examples/c/broker.c
+++ b/examples/c/broker.c
@@ -399,9 +399,8 @@ int main(int argc, char **argv) {
queues_init(&b.queues);
b.container_id = argv[0];
b.threads = 4;
- int i = 1;
- const char *host = (argc > i) ? argv[i++] : "";
- const char *port = (argc > i) ? argv[i++] : "amqp";
+ const char *host = (argc > 1) ? argv[1] : "";
+ const char *port = (argc > 2) ? argv[2] : "amqp";
/* Listen on addr */
char addr[PN_MAX_ADDR];
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d341350c/examples/c/receive.c
----------------------------------------------------------------------
diff --git a/examples/c/receive.c b/examples/c/receive.c
index 049f75c..a75de1d 100644
--- a/examples/c/receive.c
+++ b/examples/c/receive.c
@@ -175,12 +175,11 @@ void run(app_data_t *app) {
int main(int argc, char **argv) {
struct app_data_t app = {0};
- int i = 0;
- app.container_id = argv[i++]; /* Should be unique */
- app.host = (argc > 1) ? argv[i++] : "";
- app.port = (argc > 1) ? argv[i++] : "amqp";
- app.amqp_address = (argc > i) ? argv[i++] : "examples";
- app.message_count = (argc > i) ? atoi(argv[i++]) : 10;
+ app.container_id = argv[0]; /* Should be unique */
+ app.host = (argc > 1) ? argv[1] : "";
+ app.port = (argc > 2) ? argv[2] : "amqp";
+ app.amqp_address = (argc > 3) ? argv[3] : "examples";
+ app.message_count = (argc > 4) ? atoi(argv[4]) : 10;
/* Create the proactor and connect */
app.proactor = pn_proactor();
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d341350c/examples/c/send.c
----------------------------------------------------------------------
diff --git a/examples/c/send.c b/examples/c/send.c
index 43da8b0..c1a6244 100644
--- a/examples/c/send.c
+++ b/examples/c/send.c
@@ -178,12 +178,11 @@ void run(app_data_t *app) {
int main(int argc, char **argv) {
struct app_data_t app = {0};
- int i = 0;
- app.container_id = argv[i++]; /* Should be unique */
- app.host = (argc > 1) ? argv[i++] : "";
- app.port = (argc > 1) ? argv[i++] : "amqp";
- app.amqp_address = (argc > i) ? argv[i++] : "examples";
- app.message_count = (argc > i) ? atoi(argv[i++]) : 10;
+ app.container_id = argv[0]; /* Should be unique */
+ app.host = (argc > 1) ? argv[1] : "";
+ app.port = (argc > 2) ? argv[2] : "amqp";
+ app.amqp_address = (argc > 3) ? argv[3] : "examples";
+ app.message_count = (argc > 4) ? atoi(argv[4]) : 10;
app.proactor = pn_proactor();
char addr[PN_MAX_ADDR];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org