IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 8, 2023, 12:17:35 PM (3 years ago)
Author:
eugene
Message:

merge from eam_branches/ipp-20220316. fixes for more pendantic gcc; add opihi memory stats; string vector improvements; use named macros for fixed string lengths

Location:
trunk/Ohana
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/opihi/cmd.basic/list.c

    r42081 r42389  
    111111      set_str_variable (line, argv[i+3]);
    112112    }
    113     snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
     113    snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
    114114    set_int_variable (line, i);
    115115
    … …  
    133133    int isFound;
    134134
    135     snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
     135    snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
    136136    int nList = get_int_variable (line, &isFound);
    137137    if (!isFound) {
    … …  
    145145
    146146    for (i = start; i < nList; i++) {
    147       snprintf (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
     147      snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
    148148      char *word = get_variable (line);
    149149      if (!word) break;
    150150      if (i > 0) {
    151         snprintf (output, MAX_LINE_LENGTH, "%s %s", tmpline, word);
     151        snprintf_nowarn (output, MAX_LINE_LENGTH, "%s %s", tmpline, word);
    152152      } else {
    153         snprintf (output, MAX_LINE_LENGTH, "%s", word);
     153        snprintf_nowarn (output, MAX_LINE_LENGTH, "%s", word);
    154154      }
    155155      strcpy (tmpline, output);
    … …  
    179179   
    180180    // old list must exist, or give an error
    181     snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[3]);
     181    snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[3]);
    182182    N = get_int_variable (line, &found);
    183183    if (!found) {
    … …  
    188188     
    189189
    190     snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
     190    snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
    191191    set_int_variable (line, N);
    192192    for (i = 0; i < N; i++) {
    193       snprintf (line, MAX_LINE_LENGTH, "%s:%d", argv[3], i);
     193      snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:%d", argv[3], i);
    194194      value = get_variable (line);
    195       // snprintf (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
     195      // snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
    196196      set_list_varname (line, argv[1], i, EXCEL_STYLE);
    197197      set_str_variable (line, value);
    … …  
    207207    }
    208208   
    209     snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
     209    snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
    210210    N = get_int_variable (line, &found);
    211211    for (i = 0; i < argc - 3; i++) {
    212       // snprintf (line, MAX_LINE_LENGTH, "%s:%d", argv[1], N + i);
     212      // snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:%d", argv[1], N + i);
    213213      set_list_varname (line, argv[1], N + i, EXCEL_STYLE);
    214214      set_str_variable (line, argv[i+3]);
    215215    }
    216     snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
     216    snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
    217217    set_int_variable (line, N + i);
    218218
    … …  
    231231    char line2[MAX_LINE_LENGTH];
    232232
    233     snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]); // line = LIST:n
     233    snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); // line = LIST:n
    234234    N = get_int_variable (line, &found);
    235235
    236236    // loop over all list elements:
    237237    for (i = 0; i < N; i++) {
    238       // snprintf (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
     238      // snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
    239239      set_list_varname (line, argv[1], i, EXCEL_STYLE); // line = LIST:i
    240240      value = get_variable (line);
    … …  
    245245        free (value);
    246246        for (j = i + 1; j < N; j++) {
    247           // snprintf (line, MAX_LINE_LENGTH, "%s:%d", argv[1], j);
     247          // snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:%d", argv[1], j);
    248248          set_list_varname (line2, argv[1], j, EXCEL_STYLE); // line2 = LIST:j
    249249          next_value = get_variable (line2);
    … …  
    252252        }
    253253        DeleteNamedScalar (line); // line = LIST:(N-1)
    254         snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]); // line = LIST:n (new value of n)
     254        snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); // line = LIST:n (new value of n)
    255255        set_int_variable (line, N - 1);
    256256        return (TRUE);
    … …  
    309309      depth --;
    310310      if (depth < 0) { /* we hit the last "END", loop is done */
    311         snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
     311        snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
    312312        set_int_variable (line, i);
    313313        free (input);
    … …  
    317317
    318318    if (*input) {
    319       // snprintf (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
     319      // snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:%d", argv[1], i);
    320320      set_list_varname (line, argv[1], i, EXCEL_STYLE);
    321321      set_str_variable (line, input);
    … …  
    381381  free (val);
    382382   
    383   snprintf (line, MAX_LINE_LENGTH, "%s:n", listname);
     383  snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", listname);
    384384  set_int_variable (line, i);
    385385  return (TRUE);
    … …  
    399399  // otherwise save all glob matches
    400400  if (globList.gl_pathc == 0) {
    401     snprintf (line, MAX_LINE_LENGTH, "%s:n", listname);
     401    snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", listname);
    402402    set_int_variable (line, 0);
    403403    return TRUE;
    … …  
    409409    set_str_variable (line, globList.gl_pathv[i]);
    410410  }
    411   snprintf (line, MAX_LINE_LENGTH, "%s:n", listname);
     411  snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", listname);
    412412  set_int_variable (line, Nfile);
    413413  return (TRUE);
    … …  
    430430    Nline ++;
    431431  }
    432   snprintf (varname, MAX_LINE_LENGTH, "%s:n", listname);
     432  snprintf_nowarn (varname, MAX_LINE_LENGTH, "%s:n", listname);
    433433  set_int_variable (varname, Nline);
    434434  return TRUE;
    … …  
    463463    FREE (new);
    464464  }
    465   snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
     465  snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]);
    466466  set_int_variable (line, nWords);
    467467
Note: See TracChangeset for help on using the changeset viewer.