projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use strdup() instead of strncpy().
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index e6f17abbddcc236ae726dc91e15d938c51a9ec38..6dd24e0c89f6ced0e9b67c7a162b3caf6e9b82e6 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-21,6
+21,17
@@
void* xmalloc(size_t size)
return(ptr);
}
return(ptr);
}
+char* xstrdup(const char* s)
+{
+ char* ptr = strdup(s);
+ if (ptr == NULL)
+ {
+ fprintf(stderr, "Out of memory!\n");
+ exit(EXIT_FAILURE);
+ }
+ return(ptr);
+}
+
void packed_to_token(long packed, char token[6])
{
// Unpack and map back to ASCII.
void packed_to_token(long packed, char token[6])
{
// Unpack and map back to ASCII.
@@
-60,8
+71,7
@@
void newspeak(char* msg)
printf("\n");
// Create a copy of our string, so we can edit it.
printf("\n");
// Create a copy of our string, so we can edit it.
- char* copy = (char*) xmalloc(strlen(msg) + 1);
- strncpy(copy, msg, strlen(msg) + 1);
+ char* copy = xstrdup(msg);
// Staging area for stringified parameters.
char parameters[5][100]; // FIXME: to be replaced with dynamic allocation
// Staging area for stringified parameters.
char parameters[5][100]; // FIXME: to be replaced with dynamic allocation
@@
-698,7
+708,4
@@
void DATIME(long* d, long* t)
*t = (long) tv.tv_usec;
}
*t = (long) tv.tv_usec;
}
-long MOD(long n, long m)
-{
- return(n%m);
-}
+/* end */