int
GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
const char *mem,
- const size_t size,
+ size_t size,
int allow_inline)
{
char *line;
char *tag;
char *value;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Deserializing config file\n");
ret = GNUNET_OK;
section = GNUNET_strdup ("");
nr = 0;
value = &line[1];
GNUNET_free (section);
section = GNUNET_strdup (value);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Config section `%s'\n",
- section);
continue;
}
if (NULL != (eq = strchr (line, '=')))
value[strlen (value) - 1] = '\0';
value++;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Config value %s=\"%s\"\n", tag, value);
GNUNET_CONFIGURATION_set_value_string (cfg, section, tag, &value[i]);
GNUNET_free (tag);
continue;
ret = GNUNET_SYSERR;
break;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished deserializing config\n");
GNUNET_free_non_null (line_orig);
GNUNET_free (section);
GNUNET_assert ( (GNUNET_OK != ret) || (r_bytes == size) );
int dirty;
int ret;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to parse config file `%s'\n",
- filename);
fn = GNUNET_STRINGS_filename_expand (filename);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Config file name expanded to `%s'\n",
+ "Asked to parse config file `%s'\n",
fn);
if (NULL == fn)
return GNUNET_SYSERR;
GNUNET_DISK_file_size (fn, &fs64, GNUNET_YES, GNUNET_YES))
{
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Error while determining the file size of %s\n", fn);
+ "Error while determining the file size of `%s'\n",
+ fn);
GNUNET_free (fn);
return GNUNET_SYSERR;
}
if (fs != GNUNET_DISK_fn_read (fn, mem, fs))
{
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Error while reading file %s\n",
+ _("Error while reading file `%s'\n"),
fn);
GNUNET_free (fn);
GNUNET_free (mem);
{
len = GNUNET_asprintf (&cbuf, "[%s]\n", sec->name);
GNUNET_assert (0 < len);
- memcpy (mem + c_size, cbuf, len);
+ GNUNET_memcpy (mem + c_size, cbuf, len);
c_size += len;
GNUNET_free (cbuf);
for (ent = sec->entries; NULL != ent; ent = ent->next)
}
len = GNUNET_asprintf (&cbuf, "%s = %s\n", ent->key, val);
GNUNET_free (val);
- memcpy (mem + c_size, cbuf, len);
+ GNUNET_memcpy (mem + c_size, cbuf, len);
c_size += len;
GNUNET_free (cbuf);
}
}
- memcpy (mem + c_size, "\n", 1);
+ GNUNET_memcpy (mem + c_size, "\n", 1);
c_size ++;
sec = sec->next;
}
GNUNET_free (fn);
GNUNET_free (cfg_buf);
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Writing configration to file: %s failed\n", filename);
+ "Writing configration to file `%s' failed\n",
+ filename);
cfg->dirty = GNUNET_SYSERR; /* last write failed */
return GNUNET_SYSERR;
}
*/
static struct ConfigSection *
find_section (const struct GNUNET_CONFIGURATION_Handle *cfg,
- const char *section)
+ const char *section)
{
struct ConfigSection *pos;
{
struct ConfigEntry *e;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to retrieve string `%s' in section `%s'\n",
- option,
- section);
if ( (NULL == (e = find_entry (cfg, section, option))) ||
(NULL == e->val) )
{
return orig;
}
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to $-expand %s\n", orig);
+ "Asked to $-expand %s\n",
+ orig);
if ('$' != orig[0])
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
start,
&prefix))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Filename for `%s' is not in PATHS config section\n",
- start);
if (NULL == (env = getenv (start)))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "`%s' is not an environment variable\n",
- start);
/* try default */
def = expand_dollar (cfg, def, depth + 1);
env = def;
prefix = GNUNET_strdup (env);
}
prefix = GNUNET_CONFIGURATION_expand_dollar (cfg, prefix);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Prefix is `%s'\n",
- prefix);
if ( (erased_pos) && ('}' != erased_char) )
{
len = strlen (prefix) + 1;
GNUNET_free_non_null (def);
GNUNET_free (prefix);
GNUNET_free (orig);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Expanded to `%s'\n",
- result);
return result;
}
dup = expand_dollar (cfg, dup, 0);
len = strlen (dup) + 1;
orig = GNUNET_realloc (orig, i + len);
- memcpy (orig + i, dup, len);
+ GNUNET_memcpy (orig + i, dup, len);
GNUNET_free (dup);
}
return orig;
{
char *tmp;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to retrieve filename `%s' in section `%s'\n",
- option,
- section);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, section, option, &tmp))
{
*value = NULL;
return GNUNET_SYSERR;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Retrieved filename `%s', $-expanding\n", tmp);
tmp = GNUNET_CONFIGURATION_expand_dollar (cfg, tmp);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Expanded to filename `%s', *nix-expanding\n", tmp);
*value = GNUNET_STRINGS_filename_expand (tmp);
GNUNET_free (tmp);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Filename result is `%s'\n", *value);
if (*value == NULL)
return GNUNET_SYSERR;
return GNUNET_OK;