diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-11 10:34:44 +0300 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-11 13:33:06 +0300 |
commit | efad8923a292dc51d7cb8211f7b91977ffda4a33 (patch) | |
tree | 62e4d15f111265c09324fbed8322d7a336c7291b /src/storage.c | |
parent | aeb998cac207ca2134618c5567fb2d5503d94245 (diff) | |
download | bluez-efad8923a292dc51d7cb8211f7b91977ffda4a33.tar.gz |
core: Fix filename contruction with PATH_MAX and snprintf
PATH_MAX contains the terminating null, so there's no need to +1 to it.
Also, snprintf guarantees a null-terminated string, so there's no need
to explicitly set a terminating character after the call.
Diffstat (limited to 'src/storage.c')
-rw-r--r-- | src/storage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/storage.c b/src/storage.c index b230e1efc..127af555c 100644 --- a/src/storage.c +++ b/src/storage.c @@ -67,7 +67,7 @@ static inline int create_filename(char *buf, size_t size, int read_discoverable_timeout(const char *src, int *timeout) { - char filename[PATH_MAX + 1], *str; + char filename[PATH_MAX], *str; create_name(filename, PATH_MAX, STORAGEDIR, src, "config"); @@ -87,7 +87,7 @@ int read_discoverable_timeout(const char *src, int *timeout) int read_pairable_timeout(const char *src, int *timeout) { - char filename[PATH_MAX + 1], *str; + char filename[PATH_MAX], *str; create_name(filename, PATH_MAX, STORAGEDIR, src, "config"); @@ -107,7 +107,7 @@ int read_pairable_timeout(const char *src, int *timeout) int read_on_mode(const char *src, char *mode, int length) { - char filename[PATH_MAX + 1], *str; + char filename[PATH_MAX], *str; create_name(filename, PATH_MAX, STORAGEDIR, src, "config"); @@ -125,7 +125,7 @@ int read_on_mode(const char *src, char *mode, int length) int read_local_name(const bdaddr_t *bdaddr, char *name) { - char filename[PATH_MAX + 1], *str; + char filename[PATH_MAX], *str; int len; create_filename(filename, PATH_MAX, bdaddr, "config"); |