mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-30 08:00:51 +00:00
whitespace
This commit is contained in:
parent
d00d6a539a
commit
5a30278e77
1 changed files with 37 additions and 31 deletions
|
@ -26,6 +26,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static const char rcsid[] =
|
static const char rcsid[] =
|
||||||
|
|
||||||
"$Id$";
|
"$Id$";
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -40,7 +41,8 @@ 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;
|
||||||
|
@ -58,7 +60,7 @@ void
|
||||||
dstring_adjust (dstring_t *dstr)
|
dstring_adjust (dstring_t *dstr)
|
||||||
{
|
{
|
||||||
if (dstr->size > dstr->truesize) {
|
if (dstr->size > dstr->truesize) {
|
||||||
dstr->str = realloc(dstr->str, dstr->size);
|
dstr->str = realloc (dstr->str, dstr->size);
|
||||||
if (!dstr->str)
|
if (!dstr->str)
|
||||||
Sys_Error ("dstring_adjust: Failed to reallocate memory.\n");
|
Sys_Error ("dstring_adjust: Failed to reallocate memory.\n");
|
||||||
dstr->truesize = dstr->size;
|
dstr->truesize = dstr->size;
|
||||||
|
@ -83,14 +85,14 @@ dstring_insert (dstring_t *dstr, const char *data, unsigned int len,
|
||||||
|
|
||||||
dstr->size += len;
|
dstr->size += len;
|
||||||
dstring_adjust (dstr);
|
dstring_adjust (dstr);
|
||||||
memmove (dstr->str+pos+len, dstr->str+pos, oldsize - pos);
|
memmove (dstr->str + pos + len, dstr->str + pos, oldsize - pos);
|
||||||
memcpy (dstr->str+pos, data, len);
|
memcpy (dstr->str + pos, data, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
dstring_snip (dstring_t *dstr, unsigned int pos, unsigned int len)
|
dstring_snip (dstring_t *dstr, unsigned int pos, unsigned int len)
|
||||||
{
|
{
|
||||||
memmove (dstr->str+pos, dstr->str+pos+len, dstr->size-pos-len);
|
memmove (dstr->str + pos, dstr->str + pos + len, dstr->size - pos - len);
|
||||||
dstr->size -= len;
|
dstr->size -= len;
|
||||||
dstring_adjust (dstr);
|
dstring_adjust (dstr);
|
||||||
}
|
}
|
||||||
|
@ -107,45 +109,49 @@ 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;
|
||||||
dstring_adjust(new);
|
dstring_adjust (new);
|
||||||
new->str[0] = 0;
|
new->str[0] = 0;
|
||||||
return new;
|
return new;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
dstring_appendstr (dstring_t *dstr, const char *str) {
|
dstring_appendstr (dstring_t *dstr, const char *str)
|
||||||
dstr->size += strlen(str);
|
{
|
||||||
dstring_adjust(dstr);
|
dstr->size += strlen (str);
|
||||||
strcat(dstr->str, str);
|
dstring_adjust (dstr);
|
||||||
|
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;
|
||||||
dstring_adjust(dstr);
|
dstring_adjust (dstr);
|
||||||
strncat(dstr->str, str, len);
|
strncat (dstr->str, str, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
dstring_insertstr (dstring_t *dstr, const char *str, unsigned int pos)
|
dstring_insertstr (dstring_t *dstr, const char *str, unsigned int pos)
|
||||||
{
|
{
|
||||||
// Don't insert strlen + 1 to achieve concatenation
|
// Don't insert strlen + 1 to achieve concatenation
|
||||||
dstring_insert (dstr, str, strlen(str), pos);
|
dstring_insert (dstr, str, strlen (str), pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
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);
|
||||||
|
|
Loading…
Reference in a new issue