niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify logging and remove unwanted functions from abstraction layer

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-11-26 19:10:09 +01:00
parent ac020f62f7
commit 1cf03332ca
97 changed files with 2819 additions and 5361 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/util/src/ut_expand_envvars.c
View file

@ -44,7 +44,7 @@ static char *expand_env (const char *name, char op, const char *alt, expand_fn e
return os_strdup (env);
} else {
char *altx = expand (alt);
OS_ERROR("configuration parser", 0, "%s: %s\n", name, altx);
DDS_ERROR("%s: %s\n", name, altx);
os_free (altx);
return NULL;
}
@ -123,7 +123,7 @@ static char *expand_envbrace (const char **src, expand_fn expand)
return x;
}
err:
OS_ERROR("configuration parser", 0, "%*.*s: invalid expansion\n", (int) (*src - start), (int) (*src - start), start);
DDS_ERROR("%*.*s: invalid expansion\n", (int) (*src - start), (int) (*src - start), start);
return NULL;
}
@ -163,7 +163,7 @@ char *ut_expand_envvars_sh (const char *src0)
if (*src == '\\') {
src++;
if (*src == 0) {
OS_ERROR("configuration parser", 0, "%s: incomplete escape at end of string\n", src0);
DDS_ERROR("%s: incomplete escape at end of string\n", src0);
os_free(dst);
return NULL;
}
@ -172,7 +172,7 @@ char *ut_expand_envvars_sh (const char *src0)
char *x, *xp;
src++;
if (*src == 0) {
OS_ERROR("configuration parser", 0, "%s: incomplete variable expansion at end of string\n", src0);
DDS_ERROR("%s: incomplete variable expansion at end of string\n", src0);
os_free(dst);
return NULL;
} else if (*src == '{') {