Author: astitcher
Date: Fri Apr 4 14:52:41 2014
New Revision: 1584733
URL: http://svn.apache.org/r1584733
Log:
PROTON-552: Change code to be C89 compatible
The Visual Studio C compiler before VS2013 only supports variable
declarations at the start of a code block. So change any files that are
compiled as C under Visual Studio to conform to this.
Modified:
qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc
qpid/proton/trunk/examples/messenger/c/recv.c
qpid/proton/trunk/examples/messenger/c/send.c
Modified: qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc?rev=1584733&r1=1584732&r2=1584733&view=diff
==============================================================================
--- qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc (original)
+++ qpid/proton/trunk/examples/include/pncompat/misc_funcs.inc Fri Apr 4
14:52:41 2014
@@ -47,8 +47,8 @@
pn_timestamp_t time_now(void)
{
FILETIME now;
- GetSystemTimeAsFileTime(&now);
ULARGE_INTEGER t;
+ GetSystemTimeAsFileTime(&now);
t.u.HighPart = now.dwHighDateTime;
t.u.LowPart = now.dwLowDateTime;
// Convert to milliseconds and adjust base epoch
Modified: qpid/proton/trunk/examples/messenger/c/recv.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/messenger/c/recv.c?rev=1584733&r1=1584732&r2=1584733&view=diff
==============================================================================
--- qpid/proton/trunk/examples/messenger/c/recv.c (original)
+++ qpid/proton/trunk/examples/messenger/c/recv.c Fri Apr 4 14:52:41 2014
@@ -57,6 +57,13 @@ int main(int argc, char** argv)
char* password = NULL;
char* address = (char *) "amqp://~0.0.0.0";
int c;
+
+ pn_message_t * message;
+ pn_messenger_t * messenger;
+
+ message = pn_message();
+ messenger = pn_messenger(NULL);
+
opterr = 0;
while((c = getopt(argc, argv, "hc:k:p:")) != -1)
@@ -97,12 +104,6 @@ int main(int argc, char** argv)
address = argv[optind];
}
- pn_message_t * message;
- pn_messenger_t * messenger;
-
- message = pn_message();
- messenger = pn_messenger(NULL);
-
/* load the various command line options if they're set */
if(certificate)
{
@@ -135,15 +136,17 @@ int main(int argc, char** argv)
pn_messenger_get(messenger, message);
check(messenger);
+ {
char buffer[1024];
size_t buffsize = sizeof(buffer);
+ const char* subject = pn_message_get_subject(message);
pn_data_t *body = pn_message_body(message);
pn_data_format(body, buffer, &buffsize);
printf("Address: %s\n", pn_message_get_address(message));
- const char* subject = pn_message_get_subject(message);
printf("Subject: %s\n", subject ? subject : "(no subject)");
printf("Content: %s\n", buffer);
+ }
}
}
Modified: qpid/proton/trunk/examples/messenger/c/send.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/messenger/c/send.c?rev=1584733&r1=1584732&r2=1584733&view=diff
==============================================================================
--- qpid/proton/trunk/examples/messenger/c/send.c (original)
+++ qpid/proton/trunk/examples/messenger/c/send.c Fri Apr 4 14:52:41 2014
@@ -52,9 +52,9 @@ void usage(void)
int main(int argc, char** argv)
{
int c;
- opterr = 0;
char * address = (char *) "amqp://0.0.0.0";
char * msgtext = (char *) "Hello World!";
+ opterr = 0;
while((c = getopt(argc, argv, "ha:b:c:")) != -1)
{
@@ -84,8 +84,10 @@ int main(int argc, char** argv)
if (optind < argc) msgtext = argv[optind];
+ {
pn_message_t * message;
pn_messenger_t * messenger;
+ pn_data_t * body;
message = pn_message();
messenger = pn_messenger(NULL);
@@ -93,7 +95,7 @@ int main(int argc, char** argv)
pn_messenger_start(messenger);
pn_message_set_address(message, address);
- pn_data_t *body = pn_message_body(message);
+ body = pn_message_body(message);
pn_data_put_string(body, pn_bytes(strlen(msgtext), msgtext));
pn_messenger_put(messenger, message);
check(messenger);
@@ -103,6 +105,7 @@ int main(int argc, char** argv)
pn_messenger_stop(messenger);
pn_messenger_free(messenger);
pn_message_free(message);
+ }
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
