From: Robert Swiecki <robert@swiecki.net>
Date: Sat, 10 Feb 2018 22:54:36 +0000 (+0100)
Subject: util: remove unused functions
X-Git-Tag: 2.5~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7f0acb021a0d2a121d1d2212f99d41f43f81c04;p=platform%2Fupstream%2Fnsjail.git

util: remove unused functions
---

diff --git a/config.cc b/config.cc
index 3e136b2..52d51b4 100644
--- a/config.cc
+++ b/config.cc
@@ -246,6 +246,7 @@ static bool configParseInternal(nsjconf_t* nsjconf, const nsjail::NsJailConfig&
 	}
 	for (ssize_t i = 0; i < njc.seccomp_string().size(); i++) {
 		nsjconf->kafel_string += njc.seccomp_string(i);
+		nsjconf->kafel_string += '\n';
 	}
 
 	nsjconf->cgroup_mem_max = njc.cgroup_mem_max();
diff --git a/sandbox.cc b/sandbox.cc
index a051918..e98faa4 100644
--- a/sandbox.cc
+++ b/sandbox.cc
@@ -72,8 +72,10 @@ bool preparePolicy(nsjconf_t* nsjconf) {
 	kafel_ctxt_t ctxt = kafel_ctxt_create();
 
 	if (f) {
+		LOG_D("Compiling seccomp policy from file: '%s'", nsjconf->kafel_file_path.c_str());
 		kafel_set_input_file(ctxt, f);
 	} else if (!nsjconf->kafel_string.empty()) {
+		LOG_D("Compiling seccomp policy from string: '%s'", nsjconf->kafel_string.c_str());
 		kafel_set_input_string(ctxt, nsjconf->kafel_string.c_str());
 	} else {
 		LOG_F(
diff --git a/util.cc b/util.cc
index 90e7a6e..d295712 100644
--- a/util.cc
+++ b/util.cc
@@ -47,50 +47,15 @@
 
 namespace util {
 
-void* memAlloc(size_t sz) {
-	void* ret = malloc(sz);
-	if (ret == NULL) {
-		LOG_F("malloc(sz=%zu) failed", sz);
-	}
-	return ret;
-}
-
-void* clearAlloc(size_t sz) {
-	void* r = malloc(sz);
-	memset(r, '\0', sz);
-	return r;
-}
-
-char* strDup(const char* str) {
-	if (str == NULL) {
-		return NULL;
-	}
-	char* ret = strdup(str);
-	if (ret == NULL) {
-		LOG_E("Cannot allocate memory for strdup(sz=%zu)", strlen(str));
-	}
-	return ret;
-}
-
-uint8_t* memDup(const uint8_t* src, size_t len) {
-	if (src == NULL) {
-		return NULL;
-	}
-	uint8_t* ret = reinterpret_cast<uint8_t*>(malloc(len));
-	memcpy(ret, src, len);
-	return ret;
-}
-
 ssize_t readFromFd(int fd, void* buf, size_t len) {
 	uint8_t* charbuf = (uint8_t*)buf;
 
 	size_t readSz = 0;
 	while (readSz < len) {
-		ssize_t sz = read(fd, &charbuf[readSz], len - readSz);
-		if (sz < 0 && errno == EINTR) continue;
-
-		if (sz <= 0) break;
-
+		ssize_t sz = TEMP_FAILURE_RETRY(read(fd, &charbuf[readSz], len - readSz));
+		if (sz <= 0) {
+			break;
+		}
 		readSz += sz;
 	}
 	return readSz;
@@ -113,11 +78,10 @@ ssize_t writeToFd(int fd, const void* buf, size_t len) {
 
 	size_t writtenSz = 0;
 	while (writtenSz < len) {
-		ssize_t sz = write(fd, &charbuf[writtenSz], len - writtenSz);
-		if (sz < 0 && errno == EINTR) continue;
-
-		if (sz < 0) return false;
-
+		ssize_t sz = TEMP_FAILURE_RETRY(write(fd, &charbuf[writtenSz], len - writtenSz));
+		if (sz < 0) {
+			return false;
+		}
 		writtenSz += sz;
 	}
 	return true;
diff --git a/util.h b/util.h
index 79ad624..427e4a7 100644
--- a/util.h
+++ b/util.h
@@ -32,10 +32,6 @@
 
 namespace util {
 
-void* memAlloc(size_t sz);
-void* clearAlloc(size_t sz);
-char* strDup(const char* str);
-uint8_t* memDup(const uint8_t* src, size_t len);
 ssize_t readFromFd(int fd, void* buf, size_t len);
 ssize_t readFromFile(const char* fname, void* buf, size_t len);
 ssize_t writeToFd(int fd, const void* buf, size_t len);