ib_acme: Add missing carriage return in usage statements

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/src/acm.c b/src/acm.c
index fed04402e390546d9478b3b0673bef1d952d3cb6..d47f9d683fa4f38ff353d8287866ff1e9ceceb39 100644 (file)
--- a/src/acm.c
+++ b/src/acm.c
@@ -2255,14 +2255,14 @@ static int acm_svr_perf_query(struct acm_client *client, struct acm_msg *msg)
        msg->hdr.data[0] = ACM_MAX_COUNTER;
        msg->hdr.data[1] = 0;
        msg->hdr.data[2] = 0;
-       len = htons(ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t)));
+       len = ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t));
        msg->hdr.length = htons(len);
 
        for (i = 0; i < ACM_MAX_COUNTER; i++)
                msg->perf_data[i] = htonll((uint64_t) atomic_get(&counter[i]));
 
        ret = send(client->sock, (char *) msg, len, 0);
-       if (ret != msg->hdr.length)
+       if (ret != len)
                acm_log(0, "ERROR - failed to send response\n");
        else
                ret = 0;

diff --git a/src/acme.c b/src/acme.c
index f3faa684d579efcd0524721bd0db5233ebaf24e7..3d7461b306ed56418ff1572b1905b3ccdbbd9473 100644 (file)
--- a/src/acme.c
+++ b/src/acme.c
@@ -76,8 +76,8 @@ static void show_usage(char *program)
        printf("   [-d dest_addr]   - destination addresses for path queries\n");
        printf("   [-v]             - verify ACM response against SA query response\n");
        printf("   [-c]             - read ACM cached data only\n");
-       printf("   [-P]             - query performance data from destination service");
-       printf("   [-S svc_addr]    - address of ACM service, default: local service");
+       printf("   [-P]             - query performance data from destination service\n");
+       printf("   [-S svc_addr]    - address of ACM service, default: local service\n");
        printf("usage 2: %s\n", program);
        printf("Generate default ib_acm service configuration and option files\n");
        printf("   -A [addr_file]   - generate local address configuration file\n");

diff --git a/src/libacm.c b/src/libacm.c
index 8e9ccdbd1a11bbaee248a09758428419c095e475..727741fa8b83bff725004e8b990419c4f1ee0086 100644 (file)
--- a/src/libacm.c
+++ b/src/libacm.c
@@ -328,12 +328,14 @@ int ib_acm_query_perf(uint64_t **counters, int *count)
        msg.hdr.length = htons(ACM_MSG_HDR_LENGTH);
 
        ret = send(sock, (char *) &msg, ACM_MSG_HDR_LENGTH, 0);
-       if (ret != msg.hdr.length)
+       if (ret != ACM_MSG_HDR_LENGTH)
                goto out;
 
        ret = recv(sock, (char *) &msg, sizeof msg, 0);
-       if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length))
+       if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length)) {
+               ret = ACM_STATUS_EINVAL;
                goto out;
+       }
 
        if (msg.hdr.status) {
                ret = acm_error(msg.hdr.status);