diff options
| author | Martin Willi <martin@revosec.ch> | 2011-04-21 13:21:26 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2011-04-21 13:35:31 +0200 |
| commit | 5b0bcfb1fc4aabb6535db91e70f7f262328e664f (patch) | |
| tree | 000c5588b5da0e498f74e251cd0e1aeaa6d597a9 /src/libstrongswan/settings.c | |
| parent | fdead26ffe1da8501a6ff5e0639a6f44c723e763 (diff) | |
| download | strongswan-5b0bcfb1fc4aabb6535db91e70f7f262328e664f.tar.bz2 strongswan-5b0bcfb1fc4aabb6535db91e70f7f262328e664f.tar.xz | |
Revert alloc_str changes
This reverts commit fdead26ffe1da8501a6ff5e0639a6f44c723e763.
This reverts commit 3e2419ebe32de72d824864eb2e0e677a7c197af1.
This reverts commit 17ce69b47a1efd6234960cf7d1f50712aee61db5.
Diffstat (limited to 'src/libstrongswan/settings.c')
| -rw-r--r-- | src/libstrongswan/settings.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c index 941eb0514..8a2248b46 100644 --- a/src/libstrongswan/settings.c +++ b/src/libstrongswan/settings.c @@ -444,21 +444,6 @@ METHOD(settings_t, get_str, char*, return def; } -METHOD(settings_t, alloc_str, char*, - private_settings_t *this, char *key, char *def, ...) -{ - char *value; - va_list args; - - va_start(args, def); - /* additional lock to savely strdup */ - this->lock->read_lock(this->lock); - value = strdupnull(find_value(this, this->top, key, args) ?: def); - this->lock->unlock(this->lock); - va_end(args); - return value; -} - /** * Described in header */ @@ -1207,7 +1192,6 @@ settings_t *settings_create(char *file) INIT(this, .public = { .get_str = _get_str, - .alloc_str = _alloc_str, .get_int = _get_int, .get_double = _get_double, .get_time = _get_time, |