storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strnew_charp and co do not modify the char* input

Browse Source
This commit is contained in:
Richard Quirk
2015-07-25 15:14:15 +02:00
parent 913628e0d6
commit 91405c0d06
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Str.c
View File

@@ -56,7 +56,7 @@ Strnew_size(int n)
} }
Str Str
Strnew_charp(char *p) Strnew_charp(const char *p)
{ {
Str x; Str x;
int n; int n;
@@ -73,7 +73,7 @@ Strnew_charp(char *p)
} }
Str Str
Strnew_m_charp(char *p, ...) Strnew_m_charp(const char *p, ...)
{ {
va_list ap; va_list ap;
Str r = Strnew(); Str r = Strnew();
@@ -87,7 +87,7 @@ Strnew_m_charp(char *p, ...)
} }
Str Str
Strnew_charp_n(char *p, int n) Strnew_charp_n(const char *p, int n)
{ {
Str x; Str x;
@@ -140,7 +140,7 @@ Strcopy(Str x, Str y)
} }
void void
Strcopy_charp(Str x, char *y) Strcopy_charp(Str x, const char *y)
{ {
int len; int len;
@@ -160,7 +160,7 @@ Strcopy_charp(Str x, char *y)
} }
void void
Strcopy_charp_n(Str x, char *y, int n) Strcopy_charp_n(Str x, const char *y, int n)
{ {
int len = n; int len = n;
@@ -180,7 +180,7 @@ Strcopy_charp_n(Str x, char *y, int n)
} }
void void
Strcat_charp_n(Str x, char *y, int n) Strcat_charp_n(Str x, const char *y, int n)
{ {
int newlen; int newlen;
@@ -209,7 +209,7 @@ Strcat(Str x, Str y)
} }
void void
Strcat_charp(Str x, char *y) Strcat_charp(Str x, const char *y)
{ {
if (y == NULL) if (y == NULL)
return; return;
@@ -301,7 +301,7 @@ Strinsert_char(Str s, int pos, char c)
} }
void void
Strinsert_charp(Str s, int pos, char *p) Strinsert_charp(Str s, int pos, const char *p)
{ {
STR_LENGTH_CHECK(s); STR_LENGTH_CHECK(s);
while (*p) while (*p)

16
Str.h
View File

@@ -30,22 +30,22 @@ typedef struct _Str {
Str Strnew(void); Str Strnew(void);
Str Strnew_size(int); Str Strnew_size(int);
Str Strnew_charp(char *); Str Strnew_charp(const char *);
Str Strnew_charp_n(char *, int); Str Strnew_charp_n(const char *, int);
Str Strnew_m_charp(char *, ...); Str Strnew_m_charp(const char *, ...);
Str Strdup(Str); Str Strdup(Str);
void Strclear(Str); void Strclear(Str);
void Strfree(Str); void Strfree(Str);
void Strcopy(Str, Str); void Strcopy(Str, Str);
void Strcopy_charp(Str, char *); void Strcopy_charp(Str, const char *);
void Strcopy_charp_n(Str, char *, int); void Strcopy_charp_n(Str, const char *, int);
void Strcat_charp_n(Str, char *, int); void Strcat_charp_n(Str, const char *, int);
void Strcat(Str, Str); void Strcat(Str, Str);
void Strcat_charp(Str, char *); void Strcat_charp(Str, const char *);
void Strcat_m_charp(Str, ...); void Strcat_m_charp(Str, ...);
Str Strsubstr(Str, int, int); Str Strsubstr(Str, int, int);
void Strinsert_char(Str, int, char); void Strinsert_char(Str, int, char);
void Strinsert_charp(Str, int, char *); void Strinsert_charp(Str, int, const char *);
void Strdelete(Str, int, int); void Strdelete(Str, int, int);
void Strtruncate(Str, int); void Strtruncate(Str, int);
void Strlower(Str); void Strlower(Str);