diff options
| author | Garrett D'Amore <garrett@damore.org> | 2020-11-16 20:44:29 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2020-11-18 21:05:16 -0800 |
| commit | b826bfc171d90f8bde7bd672c0ac14201b8b2742 (patch) | |
| tree | 5c416487f24104e6305a797af31c5e8b1aab99d1 /src/platform/posix | |
| parent | cda4885676f009e2e7f2ad5e6c52743efc8b8924 (diff) | |
| download | nng-b826bfc171d90f8bde7bd672c0ac14201b8b2742.tar.gz nng-b826bfc171d90f8bde7bd672c0ac14201b8b2742.tar.bz2 nng-b826bfc171d90f8bde7bd672c0ac14201b8b2742.zip | |
Work for test refactoring.
There are a few major areas in this change.
* CMake options are now located in a common cmake/NNGOptions.cmake
file. This should make it easier for folks to figure out what
the options are, and how they are used.
* Tests are now scoped with their directory name, which should
avoid possible name collisions with test names.
* A number of tests have been either moved or incorporated into
the newer testutil/acutest framework. We are moving away from
my old c-convey framework to something easier to debug.
* We use CMake directories a bit more extensively leading to a much
cleaner CMake structure. It's not complete, but a big step in the
right direction, and a preview of future work.
* Tests are now run with verbose flags, so we get more test results
in the CI/CD logs.
Diffstat (limited to 'src/platform/posix')
| -rw-r--r-- | src/platform/posix/posix_file.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/platform/posix/posix_file.c b/src/platform/posix/posix_file.c index 5d918d6b..d5fb5016 100644 --- a/src/platform/posix/posix_file.c +++ b/src/platform/posix/posix_file.c @@ -1,5 +1,5 @@ // -// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a @@ -323,15 +323,12 @@ nni_plat_temp_dir(void) char * nni_plat_join_dir(const char *prefix, const char *suffix) { - char * newdir; - size_t len; + char *result; - len = strlen(prefix) + strlen(suffix) + 2; - newdir = nni_alloc(strlen(prefix) + strlen(suffix) + 2); - if (newdir != NULL) { - (void) snprintf(newdir, len, "%s/%s", prefix, suffix); + if (nni_asprintf(&result, "%s/%s", prefix, suffix) == 0) { + return (result); } - return (newdir); + return (NULL); } #endif // NNG_PLATFORM_POSIX |
