Changeset 6357

Show
Ignore:
Timestamp:
19/01/10 13:50:30 (2 years ago)
Author:
westram
Message:
  • fixed type of 'not_found_counter'
  • corrected format specifiers
Location:
trunk/EDIT4
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/EDIT4/ED4_cursor.cxx

    r6353 r6357  
    599599void ED4_finish_and_show_notFoundMessage() { 
    600600    if (not_found_counter != 0) { 
    601         GBS_strcat(not_found_message, GBS_global_string("(skipped display of %i more species)\n", not_found_counter-MAX_SHOWN_MISSING_SPECIES)); 
     601        GBS_strcat(not_found_message, GBS_global_string("(skipped display of %zu more species)\n", not_found_counter-MAX_SHOWN_MISSING_SPECIES)); 
    602602        char *out_message = GBS_strclose(not_found_message); 
    603603        aw_message(out_message); 
    604         aw_message(GBS_global_string("Couldn't load %i species:", not_found_counter)); 
     604        aw_message(GBS_global_string("Couldn't load %zu species:", not_found_counter)); 
    605605        free(out_message); 
    606606    } 

  • trunk/EDIT4/ED4_main.cxx

    r6353 r6357  
    5353long ED4_counter = 0; 
    5454 
    55 long           not_found_counter;                   // nr of species which haven't been found 
     55size_t         not_found_counter;                   // nr of species which haven't been found 
    5656GBS_strstruct *not_found_message; 
    5757 

  • trunk/EDIT4/EDB_root_bact.cxx

    r6353 r6357  
    7575        not_found_counter++; 
    7676        if (not_found_counter <= MAX_SHOWN_MISSING_SPECIES) { 
    77             sprintf(dummy,"%ld. %s\n", not_found_counter, str); 
     77            sprintf(dummy,"%zu. %s\n", not_found_counter, str); 
    7878            GBS_strcat(not_found_message,dummy); 
    7979        } 
    … …  
    8888            not_found_counter++; 
    8989            if (not_found_counter <= MAX_SHOWN_MISSING_SPECIES) { 
    90                 sprintf(dummy,"%ld. %s (no data in alignment)\n", not_found_counter, str); 
     90                sprintf(dummy,"%zu. %s (no data in alignment)\n", not_found_counter, str); 
    9191                GBS_strcat(not_found_message,dummy); 
    9292            } 

  • trunk/EDIT4/ed4_defs.hxx

    r6353 r6357  
    4444// use ED4_init_notFoundMessage and ED4_finish_and_show_notFoundMessage to 
    4545// modify the following elements 
    46 #define MAX_SHOWN_MISSING_SPECIES 200               // limit no of missing species/data printed into not_found_message 
    47 extern long           not_found_counter;            // nr of species which haven't been found 
     46#define MAX_SHOWN_MISSING_SPECIES 200U              // limit no of missing species/data printed into not_found_message 
     47extern size_t         not_found_counter;            // nr of species which haven't been found 
    4848extern GBS_strstruct *not_found_message;            // error message containing (some) missing/unloadable species 
    4949