service: fix crash on exit

[dpdk.git] / lib / librte_eal / common / eal_filesystem.h

diff --git a/lib/librte_eal/common/eal_filesystem.h b/lib/librte_eal/common/eal_filesystem.h
index 64a028d..5d21f07 100644 (file)
--- a/lib/librte_eal/common/eal_filesystem.h
+++ b/lib/librte_eal/common/eal_filesystem.h
@@ -28,13 +28,17 @@ eal_create_runtime_dir(void);
 int
 eal_clean_runtime_dir(void);
 
+/** Function to return hugefile prefix that's currently set up */
+const char *
+eal_get_hugefile_prefix(void);
+
 #define RUNTIME_CONFIG_FNAME "config"
 static inline const char *
 eal_runtime_config_path(void)
 {
        static char buffer[PATH_MAX]; /* static so auto-zeroed */
 
-       snprintf(buffer, sizeof(buffer) - 1, "%s/%s", rte_eal_get_runtime_dir(),
+       snprintf(buffer, sizeof(buffer), "%s/%s", rte_eal_get_runtime_dir(),
                        RUNTIME_CONFIG_FNAME);
        return buffer;
 }
@@ -46,7 +50,7 @@ eal_mp_socket_path(void)
 {
        static char buffer[PATH_MAX]; /* static so auto-zeroed */
 
-       snprintf(buffer, sizeof(buffer) - 1, "%s/%s", rte_eal_get_runtime_dir(),
+       snprintf(buffer, sizeof(buffer), "%s/%s", rte_eal_get_runtime_dir(),
                        MP_SOCKET_FNAME);
        return buffer;
 }
@@ -66,7 +70,7 @@ eal_hugepage_info_path(void)
 {
        static char buffer[PATH_MAX]; /* static so auto-zeroed */
 
-       snprintf(buffer, sizeof(buffer) - 1, "%s/%s", rte_eal_get_runtime_dir(),
+       snprintf(buffer, sizeof(buffer), "%s/%s", rte_eal_get_runtime_dir(),
                        HUGEPAGE_INFO_FNAME);
        return buffer;
 }
@@ -78,7 +82,7 @@ eal_hugepage_data_path(void)
 {
        static char buffer[PATH_MAX]; /* static so auto-zeroed */
 
-       snprintf(buffer, sizeof(buffer) - 1, "%s/%s", rte_eal_get_runtime_dir(),
+       snprintf(buffer, sizeof(buffer), "%s/%s", rte_eal_get_runtime_dir(),
                        HUGEPAGE_DATA_FNAME);
        return buffer;
 }
@@ -89,19 +93,7 @@ static inline const char *
 eal_get_hugefile_path(char *buffer, size_t buflen, const char *hugedir, int f_id)
 {
        snprintf(buffer, buflen, HUGEFILE_FMT, hugedir,
-                       internal_config.hugefile_prefix, f_id);
-       buffer[buflen - 1] = '\0';
-       return buffer;
-}
-
-/** String format for hugepage map lock files. */
-#define HUGEFILE_LOCK_FMT "%s/map_%d.lock"
-static inline const char *
-eal_get_hugefile_lock_path(char *buffer, size_t buflen, int f_id)
-{
-       snprintf(buffer, buflen, HUGEFILE_LOCK_FMT, rte_eal_get_runtime_dir(),
-                       f_id);
-       buffer[buflen - 1] = '\0';
+                       eal_get_hugefile_prefix(), f_id);
        return buffer;
 }