X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fshm.c;h=b94f4eb6a7aae86aed5fc080689e3f755456c719;hp=55d00e67fdd1cf443ac82c4160be3a003d6f0b18;hb=0525e9ae15d215943d8187e7f190d5a45e723085;hpb=1d76b9222464f9e10128ae867cd56a9317da5d65

diff --git a/src/bin/lttng-sessiond/shm.c b/src/bin/lttng-sessiond/shm.c
index 55d00e67f..b94f4eb6a 100644
--- a/src/bin/lttng-sessiond/shm.c
+++ b/src/bin/lttng-sessiond/shm.c
@@ -2,18 +2,18 @@
  * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
  *                       Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -43,6 +43,8 @@ static int get_wait_shm(char *shm_path, size_t mmap_size, int global)
 	int wait_shm_fd, ret;
 	mode_t mode;
 
+	assert(shm_path);
+
 	/* Default permissions */
 	mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
 
@@ -51,7 +53,7 @@ static int get_wait_shm(char *shm_path, size_t mmap_size, int global)
 		ret = chown(shm_path, 0, 0);
 		if (ret < 0) {
 			if (errno != ENOENT) {
-				perror("chown wait shm");
+				PERROR("chown wait shm");
 				goto error;
 			}
 		}
@@ -65,7 +67,7 @@ static int get_wait_shm(char *shm_path, size_t mmap_size, int global)
 		ret = chown(shm_path, getuid(), getgid());
 		if (ret < 0) {
 			if (errno != ENOENT) {
-				perror("chown wait shm");
+				PERROR("chown wait shm");
 				goto error;
 			}
 		}
@@ -77,7 +79,7 @@ static int get_wait_shm(char *shm_path, size_t mmap_size, int global)
 	ret = chmod(shm_path, mode);
 	if (ret < 0) {
 		if (errno != ENOENT) {
-			perror("chmod wait shm");
+			PERROR("chmod wait shm");
 			goto error;
 		}
 	}
@@ -94,20 +96,20 @@ static int get_wait_shm(char *shm_path, size_t mmap_size, int global)
 	 */
 	wait_shm_fd = shm_open(shm_path, O_RDWR | O_CREAT, mode);
 	if (wait_shm_fd < 0) {
-		perror("shm_open wait shm");
+		PERROR("shm_open wait shm");
 		goto error;
 	}
 
 	ret = ftruncate(wait_shm_fd, mmap_size);
 	if (ret < 0) {
-		perror("ftruncate wait shm");
+		PERROR("ftruncate wait shm");
 		exit(EXIT_FAILURE);
 	}
 
 #ifndef __FreeBSD__
 	ret = fchmod(wait_shm_fd, mode);
 	if (ret < 0) {
-		perror("fchmod");
+		PERROR("fchmod");
 		exit(EXIT_FAILURE);
 	}
 #else
@@ -138,6 +140,8 @@ char *shm_ust_get_mmap(char *shm_path, int global)
 	int wait_shm_fd, ret;
 	char *wait_shm_mmap;
 
+	assert(shm_path);
+
 	wait_shm_fd = get_wait_shm(shm_path, mmap_size, global);
 	if (wait_shm_fd < 0) {
 		goto error;
@@ -149,7 +153,7 @@ char *shm_ust_get_mmap(char *shm_path, int global)
 	/* close shm fd immediately after taking the mmap reference */
 	ret = close(wait_shm_fd);
 	if (ret) {
-		perror("Error closing fd");
+		PERROR("Error closing fd");
 	}
 
 	if (wait_shm_mmap == MAP_FAILED) {