whitespace

This commit is contained in:
Bill Currie 2002-03-21 21:56:22 +00:00
parent d00d6a539a
commit 5a30278e77

View file

@ -26,6 +26,7 @@
*/ */
static const char rcsid[] = static const char rcsid[] =
"$Id$"; "$Id$";
#include <stdlib.h> #include <stdlib.h>
@ -41,6 +42,7 @@ dstring_new (void)
dstring_t *new; dstring_t *new;
new = calloc (1, sizeof (dstring_t)); new = calloc (1, sizeof (dstring_t));
if (!new) if (!new)
Sys_Error ("dstring_new: Failed to allocate memory.\n"); Sys_Error ("dstring_new: Failed to allocate memory.\n");
return new; return new;
@ -108,6 +110,7 @@ dstring_newstr (void)
dstring_t *new; dstring_t *new;
new = calloc (1, sizeof (dstring_t)); new = calloc (1, sizeof (dstring_t));
if (!new) if (!new)
Sys_Error ("dstring_newstr: Failed to allocate memory.\n"); Sys_Error ("dstring_newstr: Failed to allocate memory.\n");
new->size = 1; new->size = 1;
@ -117,15 +120,18 @@ dstring_newstr (void)
} }
void void
dstring_appendstr (dstring_t *dstr, const char *str) { dstring_appendstr (dstring_t *dstr, const char *str)
{
dstr->size += strlen (str); dstr->size += strlen (str);
dstring_adjust (dstr); dstring_adjust (dstr);
strcat (dstr->str, str); strcat (dstr->str, str);
} }
void void
dstring_appendsubstr (dstring_t *dstr, const char *str, unsigned int len) { dstring_appendsubstr (dstring_t *dstr, const char *str, unsigned int len)
{
unsigned int l = strlen (str); unsigned int l = strlen (str);
if (len > l) if (len > l)
len = l; len = l;
dstr->size += len; dstr->size += len;
@ -144,8 +150,8 @@ void
dstring_insertsubstr (dstring_t *dstr, const char *str, unsigned int pos, dstring_insertsubstr (dstring_t *dstr, const char *str, unsigned int pos,
unsigned int len) unsigned int len)
{ {
// Don't insert strlen + 1 to achieve concatenation
unsigned int l = strlen (str); unsigned int l = strlen (str);
if (len > l) if (len > l)
len = l; len = l;
dstring_insert (dstr, str, len, pos); dstring_insert (dstr, str, len, pos);