From 41648f17f47ba9362a2e589fa647f5f9dda69693 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 30 Jul 2013 18:37:08 -0700
Subject: [PATCH] commit

---
 meta                                   |  3 +-
 patches/4-4-declare-server_port-as-an- | 45 --------------------------
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 patches/4-4-declare-server_port-as-an-

diff --git a/meta b/meta
index da2da205..d6b4c4f8 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 7041ccdd0b7f957f2c8707943bc8dd13797a6a42
+Previous: d671f1c3343921e5ce69ca08d4d4197bf2f0d5ee
 Head: a8becf33bbbb363cb2e0f2b45456bc82b345c453
 Applied:
-  4-4-declare-server_port-as-an-: a8becf33bbbb363cb2e0f2b45456bc82b345c453
 Unapplied:
   rst-afib: 83c2c70b91d4a93bbdd9bbec501de3a23e77a3bd
   ex-afib: c9db8cd19f07ddfaaa60772b43a6bdb11772d586
diff --git a/patches/4-4-declare-server_port-as-an- b/patches/4-4-declare-server_port-as-an-
deleted file mode 100644
index 168ebd07..00000000
--- a/patches/4-4-declare-server_port-as-an-
+++ /dev/null
@@ -1,45 +0,0 @@
-Bottom: a0d620c83a5f202817b4ad05221e95008e34a381
-Top:    41e944da9e3a2e6f7aecde72a095aee914508844
-Author: Bart Van Assche <bvanassche@acm.org>
-Date:   2013-07-28 11:20:54 +0200
-
-[4/4] Declare 'server_port' as an unsigned variable
-
-Change the data type of the 'server_port' variable from signed to
-unsigned such that the cast in the fscanf() call can be removed.
-
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 49bda48..33379cf 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -35,6 +35,7 @@
- #endif /* HAVE_CONFIG_H */
- 
- #include <stdio.h>
-+#include <inttypes.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
-@@ -113,7 +114,7 @@ struct acm_msg {
- 
- static pthread_mutex_t acm_lock = PTHREAD_MUTEX_INITIALIZER;
- static int sock = -1;
--static short server_port;
-+static uint16_t server_port;
- 
- struct ib_connect_hdr {
- 	uint8_t  cma_version;
-@@ -132,7 +133,7 @@ static int ucma_set_server_port(void)
- 	FILE *f;
- 
- 	if ((f = fopen("/var/run/ibacm.port", "r" STREAM_CLOEXEC))) {
--		fscanf(f, "%hu", (unsigned short *) &server_port);
-+		fscanf(f, "%" SCNu16, &server_port);
- 		fclose(f);
- 	}
- 	return server_port;
-- 
2.46.0