Ignore:
Timestamp:
Jan 28, 2007, 11:20:07 PM (12 years ago)
Author:
bruno
Message:

merge -r1078:1080 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/common/libmondo-filelist.c

    r1046 r1081  
    455455        mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
    456456        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);
    457         paranoid_free(strtmp);
     457        mr_free(strtmp);
    458458        call_exe_and_pipe_output_to_fd(syscall, pout);
    459459        mr_free(syscall);
     
    766766    }
    767767    // add here
    768     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
    769         log_to_screen(_("failed to malloc"));
    770         depth--;
    771         return (1);
    772     }
     768    newnode = (struct s_node *) mr_malloc(sizeof(struct s_node));
    773769    if (char_to_add < node->ch) // add to the left of node
    774770    {
     
    796792    log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
    797793    for (i = 1; i < noof_chars; i++) {
    798         if (!
    799             (node->down =
    800              (struct s_node *) malloc(sizeof(struct s_node)))) {
    801             log_to_screen(_("%s - failed to malloc"), string_to_add);
    802             return (1);
     794            node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
    803795        }
    804796        node = node->down;
     
    858850    }
    859851    g_original_noof_lines_in_filelist = lines_in_filelist;
    860     if (!(filelist = (struct s_node *) malloc(sizeof(struct s_node)))) {
    861         return (NULL);
    862     }
     852    filelist = (struct s_node *) mr_malloc(sizeof(struct s_node));
    863853    filelist->ch = '/';
    864854    filelist->right = NULL;
    865     filelist->down = malloc(sizeof(struct s_node));
     855    filelist->down = mr_malloc(sizeof(struct s_node));
    866856    filelist->expanded = filelist->selected = FALSE;
    867857    (filelist->down)->ch = '\0';
Note: See TracChangeset for help on using the changeset viewer.