where.line_number = 0;
err_push_file_locator (&where);
- ds_init (NULL, &line, 128);
+ ds_init (&line, 128);
if (init_fn == NULL)
{
msg (ME, _("Reading %s: %s."), init_fn, strerror (errno));
break;
}
- for (cp = ds_value (&line); isspace ((unsigned char) *cp); cp++);
+ for (cp = ds_c_str (&line); isspace ((unsigned char) *cp); cp++);
if (!strncmp ("define", cp, 6) && isspace ((unsigned char) cp[6]))
outp_configure_macro (&cp[7]);
else if (*cp)
while (*prog && *prog != quote)
{
if (*prog != '\\')
- ds_putchar (&op_tokstr, *prog++);
+ ds_putc (&op_tokstr, *prog++);
else
{
int c;
msg (IS, _("Syntax error in string constant."));
continue;
}
- ds_putchar (&op_tokstr, (unsigned char) c);
+ ds_putc (&op_tokstr, (unsigned char) c);
}
}
prog++;
}
else
while (*prog && !isspace ((unsigned char) *prog) && *prog != '=')
- ds_putchar (&op_tokstr, *prog++);
+ ds_putc (&op_tokstr, *prog++);
op_token = 'a';
}
prog = s;
op_token = -1;
- ds_init (NULL, &op_tokstr, 64);
+ ds_init (&op_tokstr, 64);
while (tokener ())
{
char key[65];
}
ds_truncate (&op_tokstr, 64);
- strcpy (key, ds_value (&op_tokstr));
+ strcpy (key, ds_c_str (&op_tokstr));
tokener ();
if (op_token != '=')
where.filename = pprsz_fn;
where.line_number = 0;
err_push_file_locator (&where);
- ds_init (NULL, &line, 128);
+ ds_init (&line, 128);
if (pprsz_fn == NULL)
{
msg (ME, _("Reading %s: %s."), pprsz_fn, strerror (errno));
break;
}
- for (cp = ds_value (&line); isspace ((unsigned char) *cp); cp++);
+ for (cp = ds_c_str (&line); isspace ((unsigned char) *cp); cp++);
if (*cp == 0)
continue;
if (*cp != '"')