[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/23] use g_path_get_dirname instead of dirname
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 01/23] use g_path_get_dirname instead of dirname |
Date: |
Mon, 18 Jul 2016 11:27:33 +0200 |
From: Wei Jiangang <address@hidden>
Use g_path_get_basename to get the directory components of
a file name, and free its return when no longer needed.
Signed-off-by: Wei Jiangang <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
os-posix.c | 3 ++-
util/oslib-posix.c | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/os-posix.c b/os-posix.c
index 3755265..c6ddb7d 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -89,7 +89,7 @@ char *os_find_datadir(void)
if (exec_dir == NULL) {
return NULL;
}
- dir = dirname(exec_dir);
+ dir = g_path_get_dirname(exec_dir);
max_len = strlen(dir) +
MAX(strlen(SHARE_SUFFIX), strlen(BUILD_SUFFIX)) + 1;
@@ -103,6 +103,7 @@ char *os_find_datadir(void)
}
}
+ g_free(dir);
g_free(exec_dir);
return res;
}
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index d8e5dcf..6d70d9a 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -299,9 +299,11 @@ void qemu_init_exec_dir(const char *argv0)
return;
}
}
- dir = dirname(p);
+ dir = g_path_get_dirname(p);
pstrcpy(exec_dir, sizeof(exec_dir), dir);
+
+ g_free(dir);
}
char *qemu_get_exec_dir(void)
--
2.7.4
- [Qemu-devel] [PULL 00/23] TCG and misc patches for 2.7 hard freeze from 2016-07-18, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 01/23] use g_path_get_dirname instead of dirname,
Paolo Bonzini <=
- [Qemu-devel] [PULL 04/23] compiler: never omit assertions if using a static analysis tool, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 05/23] megasas: remove useless check for cmd->frame, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 03/23] hw/i386: add device tree support, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 02/23] Changed malloc to g_malloc, free to g_free in bsd-user/qemu.h, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 06/23] checkpatch: consider git extended headers valid patches, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 07/23] exec: avoid realloc in phys_map_node_reserve, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 08/23] cpu-exec: Move down some declarations in cpu_exec(), Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 09/23] util/qht: Document memory ordering assumptions, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 10/23] tcg: Pass last_tb by value to tb_find_fast(), Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 12/23] tcg: Prepare safe access to tb_flushed out of tb_lock, Paolo Bonzini, 2016/07/18