fixing up conflicting merges of #120 with #118

petersilva · petersilva · commit 20e933f625a0 · 2023-11-14T17:56:52.000-05:00
diff --git a/sr_consume.c b/sr_consume.c
@@ -149,7 +149,7 @@ signed int sr_consume_queue_declare(struct sr_context *sr_c, amqp_boolean_t pass
 	return(message_count);
 }
 
-int sr_consume_setup(struct sr_context *sr_c)
+bool sr_consume_setup(struct sr_context *sr_c)
 {
 	struct sr_binding_s *t;
 	amqp_rpc_reply_t reply;
@@ -158,7 +158,7 @@ int sr_consume_setup(struct sr_context *sr_c)
         messageCount = sr_consume_queue_declare(sr_c, 0);
 
 	if (messageCount< 0 ) {
-		return(0);
+		return(false);
         }
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ signed int sr_consume_queue_declare(struct sr_context *sr_c, amqp_boolean_t pass`
`149`	`149`	`return(message_count);`
`150`	`150`	`}`
`151`	`151`
`152`		`-int sr_consume_setup(struct sr_context *sr_c)`
	`152`	`+bool sr_consume_setup(struct sr_context *sr_c)`
`153`	`153`	`{`
`154`	`154`	`struct sr_binding_s *t;`
`155`	`155`	`amqp_rpc_reply_t reply;`
`@@ -158,7 +158,7 @@ int sr_consume_setup(struct sr_context *sr_c)`
`158`	`158`	`messageCount = sr_consume_queue_declare(sr_c, 0);`
`159`	`159`
`160`	`160`	`if (messageCount< 0 ) {`
`161`		`- return(0);`
	`161`	`+ return(false);`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`/*`