[Ayttm-commits] CVS: ayttm/src account.c,1.2,1.3 chat_window.c,1.8,1.9 contact_parser.y,1.1.1.1,1.2 input_list.c,1.1.1.1,1.2 prefs.c,1.6,1.7 value_pair.c,1.2,1.3

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv2475/src

Modified Files:
        account.c chat_window.c contact_parser.y input_list.c prefs.c 
        value_pair.c 
Log Message:
Valgrinding around


Index: account.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/account.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- account.c   3 Jan 2003 23:26:07 -0000       1.2
+++ account.c   4 Jan 2003 09:04:49 -0000       1.3
@@ -95,14 +95,16 @@
                fprintf(fp,"<GROUP>\n\tNAME=\"%s\"\n", 
((grouplist*)l1->data)->name);
                for(l2 = ((grouplist*)l1->data)->members; l2; l2=l2->next ) {
                        struct contact * c = (struct contact*)l2->data;
+                       char *strbuf = NULL;
                        fprintf(fp, 
"\t<CONTACT>\n\t\tNAME=\"%s\"\n\t\tDEFAULT_PROTOCOL=\"%s\"\n\t\tLANGUAGE=\"%s\"\n",
                                        c->nick, 
eb_services[c->default_chatb].name, c->language);
-
+                       strbuf = escape_string(c->trigger.param);
                        fprintf(fp, 
"\t\tTRIGGER_TYPE=\"%s\"\n\t\tTRIGGER_ACTION=\"%s\"\n\t\tTRIGGER_PARAM=\"%s\"\n",
                                        get_trigger_type_text(c->trigger.type), 
                                        
get_trigger_action_text(c->trigger.action),
-                                       escape_string(c->trigger.param));
-
+                                       strbuf);
+                       g_free (strbuf);
+                       
                        for(l3 = ((struct contact*)l2->data)->accounts; l3; 
l3=l3->next) {
                                eb_account * account = (eb_account*)l3->data;
                                fprintf( fp, "\t\t<ACCOUNT 
%s>\n\t\t\tNAME=\"%s\"\n\t\t</ACCOUNT>\n",

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- chat_window.c       2 Jan 2003 07:11:09 -0000       1.8
+++ chat_window.c       4 Jan 2003 09:04:49 -0000       1.9
@@ -2415,7 +2415,7 @@
      if (strchr (remote->handle,'@') ) {
         tmp_ct = g_strsplit (remote->handle,"@",2);
         remote_contact = find_contact_by_handle(tmp_ct[0]);
-        g_free (tmp_ct);
+        g_strfreev (tmp_ct);
      }
   }
 

Index: contact_parser.y
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/contact_parser.y,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- contact_parser.y    23 Dec 2002 22:05:31 -0000      1.1.1.1
+++ contact_parser.y    4 Jan 2003 09:04:49 -0000       1.2
@@ -58,6 +58,7 @@
                cur_group = g_new0(grouplist, 1);
                c = value_pair_get_value( $2, "NAME" );
                strcpy( cur_group->name, c );
+               g_free(c);
                cur_group->tree = NULL;
                value_pair_free($2);
        }
@@ -77,17 +78,20 @@
                cur_contact = g_new0( struct contact, 1 );
                c = value_pair_get_value( $2, "NAME" );
                strcpy( cur_contact->nick, c );
-
+               g_free(c);
                c = value_pair_get_value( $2, "TRIGGER_TYPE" );
                cur_contact->trigger.type = get_trigger_type_num(c);
-
+               g_free(c);
                c = value_pair_get_value( $2, "TRIGGER_ACTION" );
                cur_contact->trigger.action = get_trigger_action_num(c);
-
+               g_free(c);
                c = value_pair_get_value( $2, "TRIGGER_PARAM" );
                if(c)
                {
-                       strcpy( cur_contact->trigger.param ,unescape_string(c) 
);
+                       char *tmp = unescape_string(c);
+                       strcpy( cur_contact->trigger.param ,tmp );
+                       g_free(tmp);
+                       g_free(c);
                }
                else
                {
@@ -100,12 +104,14 @@
                   cur_contact->language[0] = c[0];
                   cur_contact->language[1] = c[1];
                   cur_contact->language[2] = '\0';
+                 g_free(c);
                 } else {
                   cur_contact->language[0] = '\0';
                 }
 
                 c = value_pair_get_value( $2, "DEFAULT_PROTOCOL" );
                cur_contact->default_chatb = get_service_id(c);
+               g_free(c);
                cur_contact->default_filetransb = cur_contact->default_chatb;
                cur_contact->group = cur_group;
                cur_contact->list_item = NULL;
@@ -151,10 +157,11 @@
                IDENTIFIER '=' STRING
                {
                        {
+                               char * tmp = escape_string ($3);
                                value_pair * vp = g_new0( value_pair, 1 );
                                strcpy( vp->key, $1 );
-                               strcpy( vp->value, escape_string($3) );
-
+                               strcpy( vp->value, tmp );
+                               free(tmp);
                                free($1);
                                free($3);
                                $$ = vp;

Index: input_list.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/input_list.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- input_list.c        23 Dec 2002 22:05:36 -0000      1.1.1.1
+++ input_list.c        4 Jan 2003 09:04:49 -0000       1.2
@@ -222,8 +222,10 @@
                                        }
 
                                        /* Was there a matching entry? */
-                                       if(value)
+                                       if(value) {
                                                
*il->widget.checkbox.value=atoi(value);
+                                               g_free(value);
+                                       }
                                }
                                break;
                        case EB_INPUT_ENTRY:
@@ -250,8 +252,10 @@
                                        }
 
                                        /* Was there a matching entry? */
-                                       if(value) 
+                                       if(value) {
                                                strncpy(il->widget.entry.value, 
value, MAX_PREF_LEN);
+                                               g_free(value);
+                                       }
                                }
                                break;
                }

Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- prefs.c     3 Jan 2003 23:26:07 -0000       1.6
+++ prefs.c     4 Jan 2003 09:04:49 -0000       1.7
@@ -1178,8 +1178,9 @@
 void save_account_info(char *service, GList *pairs)
 {
        char buff[256];
-
-       g_snprintf(buff, 256, "%s:%s", service, value_pair_get_value(pairs, 
"SCREEN_NAME"));
+       char *val = value_pair_get_value(pairs, "SCREEN_NAME");
+       g_snprintf(buff, 256, "%s:%s", service, val);
+       g_free(val);
        SetPref(buff, pairs);
 }
 

Index: value_pair.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/value_pair.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- value_pair.c        3 Jan 2003 23:26:07 -0000       1.2
+++ value_pair.c        4 Jan 2003 09:04:49 -0000       1.3
@@ -66,9 +66,11 @@
 
 GList * value_pair_add(GList * list, char * key, char * value)
 {
+       char * tmp = escape_string(value);
        value_pair * vp = g_new0(value_pair, 1);
        strcpy(vp->key, key);
-       strcpy(vp->value, escape_string(value));
+       strcpy(vp->value,tmp);
+       g_free(tmp);
        return g_list_append(list, vp);
 }