--- a/mcabber/src/main.c Wed May 04 19:33:03 2005 +0000
+++ b/mcabber/src/main.c Wed May 04 19:42:25 2005 +0000
@@ -68,7 +68,8 @@
char *compose_jid(const char *username, const char *servername,
const char *resource)
{
- char *jid = g_new(strlen(username)+strlen(servername)+strlen(resource)+3);
+ char *jid = g_new(char,
+ strlen(username)+strlen(servername)+strlen(resource)+3);
strcpy(jid, username);
strcat(jid, "@");
strcat(jid, servername);
--- a/mcabber/src/parsecfg.c Wed May 04 19:33:03 2005 +0000
+++ b/mcabber/src/parsecfg.c Wed May 04 19:42:25 2005 +0000
@@ -6,6 +6,7 @@
#include <glib.h>
#include "list.h"
+#include "utils.h"
#define MAX_LENGHT_INPUT 1024
#define cfg_entry(n) list_entry(n, cfg_entry_t, list)
@@ -21,10 +22,10 @@
void push_in_list(char *key, char *value)
{
- cfg_entry_t *new_entry = g_new0(1, sizeof(cfg_entry_t));
+ cfg_entry_t *new_entry = (cfg_entry_t*)g_new0(char, sizeof(cfg_entry_t));
- new_entry->key = (char *) g_new0(1, strlen(key) + 1);
- new_entry->value = (char *) g_new0(1, strlen(value) + 1);
+ new_entry->key = g_new0(char, strlen(key) + 1);
+ new_entry->value = g_new0(char, strlen(value) + 1);
strcpy(new_entry->key, key);
strcpy(new_entry->value, value);
@@ -63,9 +64,9 @@
exit(EXIT_FAILURE);
}
- buf = g_new(255);
+ buf = g_new(char, 256);
- while (fgets(buf, 255, fp) != NULL) {
+ while (fgets(buf, 256, fp) != NULL) {
line = buf;
while (isspace((int) *line))