From 494903c5d49182c658b9e33038951282cdf14003 Mon Sep 17 00:00:00 2001
From: Philipp Moritz <pcmoritz@gmail.com>
Date: Sat, 10 Sep 2016 17:47:37 -0700
Subject: [PATCH] fix compiler warnings (#17)

---
 .travis/check-git-clang-format-output.sh | 2 +-
 Makefile                                 | 4 ++--
 src/event_loop.h                         | 1 +
 src/fling.c                              | 2 ++
 src/malloc.c                             | 2 +-
 src/plasma_client.c                      | 2 +-
 src/plasma_manager.c                     | 2 +-
 {third_party => thirdparty}/dlmalloc.c   | 0
 8 files changed, 9 insertions(+), 6 deletions(-)
 rename {third_party => thirdparty}/dlmalloc.c (100%)

diff --git a/.travis/check-git-clang-format-output.sh b/.travis/check-git-clang-format-output.sh
index c3431f68b..d71f78357 100755
--- a/.travis/check-git-clang-format-output.sh
+++ b/.travis/check-git-clang-format-output.sh
@@ -7,7 +7,7 @@ else
   base_commit="$TRAVIS_BRANCH"
   echo "Running clang-format against branch $base_commit, with hash $(git rev-parse $base_commit)"
 fi
-output="$(.travis/git-clang-format --binary clang-format-3.8 --commit $base_commit --diff --exclude ^third_party/)"
+output="$(.travis/git-clang-format --binary clang-format-3.8 --commit $base_commit --diff --exclude ^thirdparty/)"
 if [ "$output" == "no modified files to format" ] || [ "$output" == "clang-format did not modify any files" ] ; then
   echo "clang-format passed."
   exit 0
diff --git a/Makefile b/Makefile
index c317cc938..0b8566021 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -g -Wall --std=c99 -D_XOPEN_SOURCE=500 -I.
+CFLAGS = -g -Wall --std=c99 -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L -I.
 BUILD = build
 
 all: $(BUILD)/plasma_store $(BUILD)/plasma_manager $(BUILD)/plasma_client.so $(BUILD)/example
@@ -7,7 +7,7 @@ all: $(BUILD)/plasma_store $(BUILD)/plasma_manager $(BUILD)/plasma_client.so $(B
 clean:
 	rm -r $(BUILD)/*
 
-$(BUILD)/plasma_store: src/plasma_store.c src/plasma.h src/event_loop.h src/event_loop.c src/fling.h src/fling.c src/malloc.c src/malloc.h third_party/dlmalloc.c
+$(BUILD)/plasma_store: src/plasma_store.c src/plasma.h src/event_loop.h src/event_loop.c src/fling.h src/fling.c src/malloc.c src/malloc.h thirdparty/dlmalloc.c
 	$(CC) $(CFLAGS) src/plasma_store.c src/event_loop.c src/fling.c src/malloc.c -o $(BUILD)/plasma_store
 
 $(BUILD)/plasma_manager: src/plasma_manager.c src/event_loop.h src/event_loop.c src/plasma.h src/plasma_client.c src/fling.h src/fling.c
diff --git a/src/event_loop.h b/src/event_loop.h
index b83e1df63..5dee29682 100644
--- a/src/event_loop.h
+++ b/src/event_loop.h
@@ -2,6 +2,7 @@
 #define EVENT_LOOP_H
 
 #include <poll.h>
+#include <string.h>
 
 #include "utarray.h"
 #include "plasma.h"
diff --git a/src/fling.c b/src/fling.c
index 6363fdfb0..e1417aeeb 100644
--- a/src/fling.c
+++ b/src/fling.c
@@ -1,5 +1,7 @@
 #include "fling.h"
 
+#include <string.h>
+
 void init_msg(struct msghdr *msg,
               struct iovec *iov,
               char *buf,
diff --git a/src/malloc.c b/src/malloc.c
index bbfccd462..d83423844 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -19,7 +19,7 @@ int fake_munmap(void *, size_t);
 #define USE_DL_PREFIX
 #define HAVE_MORECORE 0
 
-#include "third_party/dlmalloc.c"
+#include "thirdparty/dlmalloc.c"
 
 #undef MMAP
 #undef MUNMAP
diff --git a/src/plasma_client.c b/src/plasma_client.c
index 4442555c4..af9feeae9 100644
--- a/src/plasma_client.c
+++ b/src/plasma_client.c
@@ -116,7 +116,7 @@ int plasma_manager_connect(const char *ip_addr, int port) {
 
   struct sockaddr_in addr;
   addr.sin_family = AF_INET;
-  bcopy(manager->h_addr, &addr.sin_addr.s_addr, manager->h_length);
+  memcpy(&addr.sin_addr.s_addr, manager->h_addr, manager->h_length);
   addr.sin_port = htons(port);
 
   int r = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
diff --git a/src/plasma_manager.c b/src/plasma_manager.c
index 2e37d5f69..f6c45e099 100644
--- a/src/plasma_manager.c
+++ b/src/plasma_manager.c
@@ -49,7 +49,7 @@ void initiate_transfer(plasma_manager_state* s, plasma_request* req) {
   plasma_buffer buf = {.object_id = req->object_id, .writable = 0};
   plasma_get(store_conn, req->object_id, &buf.size, &buf.data);
 
-  char ip_addr[16];
+  char ip_addr[32];
   snprintf(ip_addr, 32, "%d.%d.%d.%d", req->addr[0], req->addr[1], req->addr[2],
            req->addr[3]);
 
diff --git a/third_party/dlmalloc.c b/thirdparty/dlmalloc.c
similarity index 100%
rename from third_party/dlmalloc.c
rename to thirdparty/dlmalloc.c