libtinyrad: updating tinyrad_strexpand() to return modified buffer

3 files changed, 12 insertions, 12 deletions

diff --git a/include/tinyrad_internal.h b/include/tinyrad_internal.h
index 42e647d..b9585bf 100644
--- a/include/tinyrad_internal.h
+++ b/include/tinyrad_internal.h
@@ -215,7 +215,7 @@ tinyrad_strdup(
          const char *                  s1 );
 
 
-_TINYRAD_F int
+_TINYRAD_F char *
 tinyrad_strexpand(
          char *                        dst,
          const char * restrict         src,
diff --git a/lib/libtinyrad/lstrings.c b/lib/libtinyrad/lstrings.c
index ffce9d1..f05efac 100644
--- a/lib/libtinyrad/lstrings.c
+++ b/lib/libtinyrad/lstrings.c
@@ -106,7 +106,7 @@ tinyrad_strdup(
 }
 
 
-int
+char *
 tinyrad_strexpand(
          char *                        dst,
          const char * restrict         src,
@@ -126,9 +126,10 @@ tinyrad_strexpand(
 
 
    assert(dst != NULL);
-   assert(src != NULL);
    assert(len  > 0);
 
+   if (!(src))
+      return(NULL);
 
    // expand escapes in buffer
    offset = 0;
@@ -160,7 +161,7 @@ tinyrad_strexpand(
          {
             case 'D': // domain name
             if (uname(&unam) == -1)
-               return(TRAD_EUNKNOWN);
+               return(NULL);
             strncpy(buff, unam.nodename, sizeof(buff));
             if ((ptr = strchr(buff, '.')) == NULL)
                buff[0] = '\0';
@@ -312,11 +313,11 @@ tinyrad_strexpand(
    if (offset >= len)
    {
       dst[len-1] = '\0';
-      return(TRAD_ENOBUFS);
+      return(NULL);
    };
    dst[offset] = '\0';
 
-   return(TRAD_SUCCESS);
+   return(dst);
 }
 
 
diff --git a/tests/test-str-expand.c b/tests/test-str-expand.c
index 0a5eb74..44c4816 100644
--- a/tests/test-str-expand.c
+++ b/tests/test-str-expand.c
@@ -133,11 +133,10 @@ main(
 {
    int                           opt;
    int                           c;
-   int                           rc;
    int                           opt_index;
    size_t                        pos;
    unsigned                      opts;
-   char                          buff[256];
+   char                          buff[TRAD_LINE_MAX_LEN];
    const MyTestStr *             test_str;
 
    // getopt options
@@ -219,9 +218,9 @@ main(
       while (optind < argc)
       {
          trutils_verbose(opts, "test string:  %s", argv[optind]);
-         if ((rc = tinyrad_strexpand(buff,  argv[optind], sizeof(buff), (((opts&TEST_OPT_FORCE)) ? TRAD_YES : TRAD_NO))) != TRAD_SUCCESS)
+         if (!(tinyrad_strexpand(buff,  argv[optind], sizeof(buff), (((opts&TEST_OPT_FORCE)) ? TRAD_YES : TRAD_NO))))
          {
-            trutils_error(opts, NULL, "tinyrad_strexpand(): %s", tinyrad_strerror(rc));
+            trutils_error(opts, NULL, "tinyrad_strexpand(): error occurred");
             return(1);
          };
          buff[sizeof(buff)-1] = '\0';
@@ -240,9 +239,9 @@ main(
    {
       test_str = &test_strings[pos];
       trutils_verbose(opts, "test string:  %s", test_strings[pos].origin);
-      if ((rc = tinyrad_strexpand(buff, test_str->origin, sizeof(buff), (int)test_str->force)) != TRAD_SUCCESS)
+      if (!(tinyrad_strexpand(buff, test_str->origin, sizeof(buff), (int)test_str->force)))
       {
-         trutils_error(opts, NULL, "tinyrad_strexpand(): %s", tinyrad_strerror(rc));
+         trutils_error(opts, NULL, "tinyrad_strexpand(): error occurred");
          return(1);
       };
       buff[sizeof(buff)-1] = '\0';