diff options
| author | TingPing <tingping@tingping.se> | 2014-12-28 06:37:25 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-12-28 06:44:44 -0500 |
| commit | 83032b1aa3c3e5910c5cfd3e0ea1d25827f56475 (patch) | |
| tree | 9be32a04d3070eac82177e11d182dad40a63baa7 /src/fe-text | |
| parent | c4cb1b25ec06a5b0cb718c6f8e74630df9a9bc64 (diff) | |
Use glib for all allocations
- Removes need to check for malloc failure - Removes need for NULL checks on free - Adds checks for integer overflows - Removes some extra memset calls - Removes chance of mixing libc and glib malloc/free
Diffstat (limited to 'src/fe-text')
| -rw-r--r-- | src/fe-text/fe-text.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c index 8ddefeea..bf96f649 100644 --- a/src/fe-text/fe-text.c +++ b/src/fe-text/fe-text.c @@ -78,7 +78,6 @@ fe_new_window (struct session *sess, int focus) { char buf[512]; - sess->gui = malloc (4); current_sess = sess; if (!sess->server->front_session) @@ -140,7 +139,7 @@ timecat (char *buf, time_t stamp) /* Windows doesn't handle ANSI codes in cmd.exe, need to not display them */ #ifndef WIN32 -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 */ +/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 */ static const short colconv[] = { 0, 7, 4, 2, 1, 3, 5, 11, 13, 12, 6, 16, 14, 15, 10, 7 }; void @@ -151,7 +150,7 @@ fe_print_text (struct session *sess, char *text, time_t stamp, char num[8]; int reverse = 0, under = 0, bold = 0, comma, k, i = 0, j = 0, len = strlen (text); - unsigned char *newtext = malloc (len + 1024); + unsigned char *newtext = g_malloc (len + 1024); if (prefs.hex_stamp_text) { @@ -308,7 +307,7 @@ fe_print_text (struct session *sess, char *text, time_t stamp, newtext[j] = 0; write (STDOUT_FILENO, newtext, j); - free (newtext); + g_free (newtext); } #else /* The win32 version for cmd.exe */ @@ -319,7 +318,7 @@ fe_print_text (struct session *sess, char *text, time_t stamp, int dotime = FALSE; int comma, k, i = 0, j = 0, len = strlen (text); - unsigned char *newtext = malloc (len + 1024); + unsigned char *newtext = g_malloc (len + 1024); if (prefs.hex_stamp_text) { @@ -403,7 +402,7 @@ fe_print_text (struct session *sess, char *text, time_t stamp, newtext[j] = 0; write (STDOUT_FILENO, newtext, j); - free (newtext); + g_free (newtext); } #endif @@ -508,14 +507,14 @@ fe_args (int argc, char *argv[]) { #ifdef WIN32 /* see the chdir() below */ - char *sl, *exe = strdup (argv[0]); + char *sl, *exe = g_strdup (argv[0]); sl = strrchr (exe, '\\'); if (sl) { *sl = 0; printf ("%s\\plugins\n", exe); } - free (exe); + g_free (exe); #else printf ("%s\n", HEXCHATLIBDIR); #endif @@ -582,7 +581,6 @@ fe_exit (void) void fe_new_server (struct server *serv) { - serv->gui = malloc (4); } void |