X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Futils.cpp;h=b4b7f749f1ef1a6e5286225437f639d01f2966d2;hb=efc2642c22639e9af4bd01953bfd4453f6218f61;hp=5e116a9ab09513baa6809ed06671954c37156372;hpb=13dd7782d52be2dac47be5116c00d3a2ba0ad626;p=lttng-tools.git

diff --git a/src/common/utils.cpp b/src/common/utils.cpp
index 5e116a9ab..b4b7f749f 100644
--- a/src/common/utils.cpp
+++ b/src/common/utils.cpp
@@ -6,36 +6,33 @@
  *
  */
 
-#include "common/macros.h"
-#include <stdint.h>
 #define _LGPL_SOURCE
 #include <ctype.h>
 #include <fcntl.h>
+#include <grp.h>
+#include <inttypes.h>
 #include <limits.h>
+#include <pwd.h>
 #include <stdlib.h>
+#include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <inttypes.h>
-#include <grp.h>
-#include <pwd.h>
-#include <sys/file.h>
-#include <unistd.h>
 
-#include <common/common.h>
-#include <common/readwrite.h>
-#include <common/runas.h>
-#include <common/compat/getenv.h>
-#include <common/compat/string.h>
-#include <common/compat/dirent.h>
-#include <common/compat/directory-handle.h>
-#include <common/dynamic-buffer.h>
-#include <common/string-utils/format.h>
+#include <common/common.hpp>
+#include <common/compat/directory-handle.hpp>
+#include <common/compat/dirent.hpp>
+#include <common/compat/getenv.hpp>
+#include <common/compat/string.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/readwrite.hpp>
+#include <common/runas.hpp>
+#include <common/string-utils/format.hpp>
 #include <lttng/constant.h>
 
-#include "utils.h"
-#include "defaults.h"
-#include "time.h"
+#include "defaults.hpp"
+#include "time.hpp"
+#include "utils.hpp"
 
 #define PROC_MEMINFO_PATH               "/proc/meminfo"
 #define PROC_MEMINFO_MEMAVAILABLE_LINE  "MemAvailable:"
@@ -174,9 +171,8 @@ void utils_close_pipe(int *src)
  */
 char *utils_strdupdelim(const char *begin, const char *end)
 {
-	char *str;
+	char *str = zmalloc<char>(end - begin + 1);
 
-	str = (char *) zmalloc(end - begin + 1);
 	if (str == NULL) {
 		PERROR("zmalloc strdupdelim");
 		goto error;
@@ -787,7 +783,7 @@ char *utils_get_user_home_dir(uid_t uid)
 		goto end;
 	}
 retry:
-	buf = (char *) zmalloc(buflen);
+	buf = zmalloc<char>(buflen);
 	if (!buf) {
 		goto end;
 	}
@@ -937,7 +933,7 @@ char *utils_generate_optstring(const struct option *long_options,
 		string_len += long_options[i].has_arg ? 1 : 0;
 	}
 
-	optstring = (char *) zmalloc(string_len);
+	optstring = zmalloc<char>(string_len);
 	if (!optstring) {
 		goto end;
 	}
@@ -1162,7 +1158,7 @@ enum lttng_error_code utils_user_id_from_name(const char *user_name, uid_t *uid)
 		buflen = FALLBACK_USER_BUFLEN;
 	}
 
-	buf = (char *) zmalloc(buflen);
+	buf = zmalloc<char>(buflen);
 	if (!buf) {
 		ret_val = LTTNG_ERR_NOMEM;
 		goto end;
@@ -1176,7 +1172,7 @@ enum lttng_error_code utils_user_id_from_name(const char *user_name, uid_t *uid)
 		case ERANGE:
 			buflen *= 2;
 			free(buf);
-			buf = (char *) zmalloc(buflen);
+			buf = zmalloc<char>(buflen);
 			if (!buf) {
 				ret_val = LTTNG_ERR_NOMEM;
 				goto end;
@@ -1227,7 +1223,7 @@ enum lttng_error_code utils_group_id_from_name(
 		buflen = FALLBACK_GROUP_BUFLEN;
 	}
 
-	buf = (char *) zmalloc(buflen);
+	buf = zmalloc<char>(buflen);
 	if (!buf) {
 		ret_val = LTTNG_ERR_NOMEM;
 		goto end;
@@ -1241,7 +1237,7 @@ enum lttng_error_code utils_group_id_from_name(
 		case ERANGE:
 			buflen *= 2;
 			free(buf);
-			buf = (char *) zmalloc(buflen);
+			buf = zmalloc<char>(buflen);
 			if (!buf) {
 				ret_val = LTTNG_ERR_NOMEM;
 				goto end;