diff options
Diffstat (limited to 'lib/libtinytac/lmemory.c')
| -rw-r--r-- | lib/libtinytac/lmemory.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/libtinytac/lmemory.c b/lib/libtinytac/lmemory.c index 1e186ab..fce6f5c 100644 --- a/lib/libtinytac/lmemory.c +++ b/lib/libtinytac/lmemory.c | |||
| @@ -241,7 +241,7 @@ tinytac_get_option( | |||
| 241 | case TTAC_OPT_DEBUG_IDENT: | 241 | case TTAC_OPT_DEBUG_IDENT: |
| 242 | TinyTacDebug(TTAC_DEBUG_ARGS, " == %s( tt, TTAC_OPT_DEBUG_IDENT, outvalue )", __func__); | 242 | TinyTacDebug(TTAC_DEBUG_ARGS, " == %s( tt, TTAC_OPT_DEBUG_IDENT, outvalue )", __func__); |
| 243 | TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tinytac_debug_ident); | 243 | TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tinytac_debug_ident); |
| 244 | if ((*((char **)outvalue) = tinytacb_strdup(tinytac_debug_ident)) == NULL) | 244 | if ((*((char **)outvalue) = bindle_strdup(tinytac_debug_ident)) == NULL) |
| 245 | return(TTAC_ENOMEM); | 245 | return(TTAC_ENOMEM); |
| 246 | return(TTAC_SUCCESS); | 246 | return(TTAC_SUCCESS); |
| 247 | 247 | ||
| @@ -261,7 +261,7 @@ tinytac_get_option( | |||
| 261 | str = ((tt)) ? tt->hosts : tinytac_dflt_hosts; | 261 | str = ((tt)) ? tt->hosts : tinytac_dflt_hosts; |
| 262 | TinyTacDebug(TTAC_DEBUG_ARGS, " == %s( %s, TTAC_OPT_HOSTS, outvalue )", __func__, (((tt)) ? "tt" : "NULL")); | 262 | TinyTacDebug(TTAC_DEBUG_ARGS, " == %s( %s, TTAC_OPT_HOSTS, outvalue )", __func__, (((tt)) ? "tt" : "NULL")); |
| 263 | TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", str); | 263 | TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", str); |
| 264 | if ((*((char **)outvalue) = tinytacb_strdup(str)) == NULL) | 264 | if ((*((char **)outvalue) = bindle_strdup(str)) == NULL) |
| 265 | return(TTAC_ENOMEM); | 265 | return(TTAC_ENOMEM); |
| 266 | return(TTAC_SUCCESS); | 266 | return(TTAC_SUCCESS); |
| 267 | 267 | ||
| @@ -286,7 +286,7 @@ tinytac_get_option( | |||
| 286 | if (!(tt->keys[0])) | 286 | if (!(tt->keys[0])) |
| 287 | return(TTAC_SUCCESS); | 287 | return(TTAC_SUCCESS); |
| 288 | TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tt->keys[0]); | 288 | TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tt->keys[0]); |
| 289 | if ((*((char **)outvalue) = tinytacb_strdup(tt->keys[0])) == NULL) | 289 | if ((*((char **)outvalue) = bindle_strdup(tt->keys[0])) == NULL) |
| 290 | return(TTAC_ENOMEM); | 290 | return(TTAC_ENOMEM); |
| 291 | return(TTAC_SUCCESS); | 291 | return(TTAC_SUCCESS); |
| 292 | 292 | ||
| @@ -298,7 +298,7 @@ tinytac_get_option( | |||
| 298 | return(TTAC_SUCCESS); | 298 | return(TTAC_SUCCESS); |
| 299 | for(pos = 0; ((tt->keys[pos])); pos++) | 299 | for(pos = 0; ((tt->keys[pos])); pos++) |
| 300 | TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tt->keys[pos]); | 300 | TinyTacDebug(TTAC_DEBUG_ARGS, " <= outvalue: %s", tt->keys[pos]); |
| 301 | if ((tinytacb_strsdup((char ***)outvalue, tt->keys))) | 301 | if ((bindle_strsdup((char ***)outvalue, tt->keys))) |
| 302 | return(TTAC_ENOMEM); | 302 | return(TTAC_ENOMEM); |
| 303 | return(TTAC_SUCCESS); | 303 | return(TTAC_SUCCESS); |
| 304 | 304 | ||
| @@ -460,7 +460,7 @@ tinytac_set_option( | |||
| 460 | case TTAC_OPT_DEBUG_IDENT: | 460 | case TTAC_OPT_DEBUG_IDENT: |
| 461 | TinyTacDebug( TTAC_DEBUG_ARGS, " == %s( %s, TTAC_OPT_DEBUG_IDENT, invalue )", __func__, (((tt)) ? "tt" : "NULL") ); | 461 | TinyTacDebug( TTAC_DEBUG_ARGS, " == %s( %s, TTAC_OPT_DEBUG_IDENT, invalue )", __func__, (((tt)) ? "tt" : "NULL") ); |
| 462 | istr = (((const char *)invalue)) ? ((const char *)invalue) : TTAC_DFLT_DEBUG_IDENT; | 462 | istr = (((const char *)invalue)) ? ((const char *)invalue) : TTAC_DFLT_DEBUG_IDENT; |
| 463 | tinytacb_strlcpy(tinytac_debug_ident_buff, istr, sizeof(tinytac_debug_ident_buff)); | 463 | bindle_strlcpy(tinytac_debug_ident_buff, istr, sizeof(tinytac_debug_ident_buff)); |
| 464 | tinytac_debug_ident = tinytac_debug_ident_buff; | 464 | tinytac_debug_ident = tinytac_debug_ident_buff; |
| 465 | return(TTAC_SUCCESS); | 465 | return(TTAC_SUCCESS); |
| 466 | 466 | ||
| @@ -601,7 +601,7 @@ tinytac_set_option_host( | |||
| 601 | budps = NULL; | 601 | budps = NULL; |
| 602 | budps_len = 0; | 602 | budps_len = 0; |
| 603 | 603 | ||
| 604 | if ((buff = tinytacb_strdup(invalue)) == NULL) | 604 | if ((buff = bindle_strdup(invalue)) == NULL) |
| 605 | return(TTAC_ENOMEM); | 605 | return(TTAC_ENOMEM); |
| 606 | 606 | ||
| 607 | str = buff; | 607 | str = buff; |
| @@ -632,7 +632,7 @@ tinytac_set_option_host( | |||
| 632 | budps[budps_len+1] = NULL; | 632 | budps[budps_len+1] = NULL; |
| 633 | 633 | ||
| 634 | // parse URL | 634 | // parse URL |
| 635 | if ((rc = tinytacb_urldesc_parse(str, &budps[budps_len])) != 0) | 635 | if ((rc = bindle_urldesc_parse(str, &budps[budps_len])) != 0) |
| 636 | { | 636 | { |
| 637 | free(buff); | 637 | free(buff); |
| 638 | tinytac_tinytac_free_budps(budps); | 638 | tinytac_tinytac_free_budps(budps); |
| @@ -655,7 +655,7 @@ tinytac_set_option_host( | |||
| 655 | }; | 655 | }; |
| 656 | 656 | ||
| 657 | // resolve URL host | 657 | // resolve URL host |
| 658 | if ((rc = tinytacb_urldesc_resolve(budps[budps_len], AF_UNSPEC, TTAC_DFLT_PORT)) != 0) | 658 | if ((rc = bindle_urldesc_resolve(budps[budps_len], AF_UNSPEC, TTAC_DFLT_PORT)) != 0) |
| 659 | { | 659 | { |
| 660 | free(buff); | 660 | free(buff); |
| 661 | tinytac_tinytac_free_budps(budps); | 661 | tinytac_tinytac_free_budps(budps); |
| @@ -669,7 +669,7 @@ tinytac_set_option_host( | |||
| 669 | free(buff); | 669 | free(buff); |
| 670 | 670 | ||
| 671 | // saves host string | 671 | // saves host string |
| 672 | if ((ostr = tinytacb_strdup(invalue)) == NULL) | 672 | if ((ostr = bindle_strdup(invalue)) == NULL) |
| 673 | { | 673 | { |
| 674 | tinytac_tinytac_free_budps(budps); | 674 | tinytac_tinytac_free_budps(budps); |
| 675 | return(TTAC_ENOMEM); | 675 | return(TTAC_ENOMEM); |
| @@ -710,22 +710,22 @@ tinytac_set_option_keys( | |||
| 710 | 710 | ||
| 711 | if ((invalue)) | 711 | if ((invalue)) |
| 712 | { | 712 | { |
| 713 | if (tinytacb_strsadd(&strs, invalue) != 0) | 713 | if (bindle_strsadd(&strs, invalue) != 0) |
| 714 | return(TTAC_ENOMEM); | 714 | return(TTAC_ENOMEM); |
| 715 | } | 715 | } |
| 716 | else if ((invalues)) | 716 | else if ((invalues)) |
| 717 | { | 717 | { |
| 718 | if (tinytacb_strsdup(&strs, invalues) != 0) | 718 | if (bindle_strsdup(&strs, invalues) != 0) |
| 719 | return(TTAC_ENOMEM); | 719 | return(TTAC_ENOMEM); |
| 720 | } | 720 | } |
| 721 | else if ((tt)) | 721 | else if ((tt)) |
| 722 | { | 722 | { |
| 723 | if ((tinytac_dflt.keys)) | 723 | if ((tinytac_dflt.keys)) |
| 724 | if (tinytacb_strsdup(&strs, tinytac_dflt.keys) != 0) | 724 | if (bindle_strsdup(&strs, tinytac_dflt.keys) != 0) |
| 725 | return(TTAC_ENOMEM); | 725 | return(TTAC_ENOMEM); |
| 726 | }; | 726 | }; |
| 727 | 727 | ||
| 728 | tinytacb_strsfree(*strsp); | 728 | bindle_strsfree(*strsp); |
| 729 | *strsp = strs; | 729 | *strsp = strs; |
| 730 | 730 | ||
| 731 | return(TTAC_SUCCESS); | 731 | return(TTAC_SUCCESS); |
| @@ -743,7 +743,7 @@ tinytac_tinytac_free( | |||
| 743 | if ((tt->hosts)) | 743 | if ((tt->hosts)) |
| 744 | free(tt->hosts); | 744 | free(tt->hosts); |
| 745 | if ((tt->keys)) | 745 | if ((tt->keys)) |
| 746 | tinytacb_strsfree(tt->keys); | 746 | bindle_strsfree(tt->keys); |
| 747 | 747 | ||
| 748 | tinytac_tinytac_free_budps(tt->budps); | 748 | tinytac_tinytac_free_budps(tt->budps); |
| 749 | 749 | ||
| @@ -762,7 +762,7 @@ tinytac_tinytac_free_budps( | |||
| 762 | if (!(budps)) | 762 | if (!(budps)) |
| 763 | return; | 763 | return; |
| 764 | for(pos = 0; ((budps[pos])); pos++) | 764 | for(pos = 0; ((budps[pos])); pos++) |
| 765 | tinytacb_urldesc_free(budps[pos]); | 765 | bindle_urldesc_free(budps[pos]); |
| 766 | free(budps); | 766 | free(budps); |
| 767 | return; | 767 | return; |
| 768 | } | 768 | } |
