Changeset 42345 for branches/eam_branches/ipp-20220316/Ohana/src/opihi
- Timestamp:
- Jan 31, 2023, 5:15:33 PM (4 years ago)
- Location:
- branches/eam_branches/ipp-20220316/Ohana/src/opihi
- Files:
-
- 5 edited
-
cmd.basic/list.c (modified) (16 diffs)
-
cmd.data/cursor.c (modified) (1 diff)
-
dvo/coordmosaic.c (modified) (2 diffs)
-
dvo/elixir.c (modified) (2 diffs)
-
pantasks/controller_status.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.basic/list.c
r42081 r42345 111 111 set_str_variable (line, argv[i+3]); 112 112 } 113 snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);113 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); 114 114 set_int_variable (line, i); 115 115 … … 133 133 int isFound; 134 134 135 snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);135 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); 136 136 int nList = get_int_variable (line, &isFound); 137 137 if (!isFound) { … … 145 145 146 146 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); 148 148 char *word = get_variable (line); 149 149 if (!word) break; 150 150 if (i > 0) { 151 snprintf (output, MAX_LINE_LENGTH, "%s %s", tmpline, word);151 snprintf_nowarn (output, MAX_LINE_LENGTH, "%s %s", tmpline, word); 152 152 } else { 153 snprintf (output, MAX_LINE_LENGTH, "%s", word);153 snprintf_nowarn (output, MAX_LINE_LENGTH, "%s", word); 154 154 } 155 155 strcpy (tmpline, output); … … 179 179 180 180 // 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]); 182 182 N = get_int_variable (line, &found); 183 183 if (!found) { … … 188 188 189 189 190 snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);190 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); 191 191 set_int_variable (line, N); 192 192 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); 194 194 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); 196 196 set_list_varname (line, argv[1], i, EXCEL_STYLE); 197 197 set_str_variable (line, value); … … 207 207 } 208 208 209 snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);209 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); 210 210 N = get_int_variable (line, &found); 211 211 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); 213 213 set_list_varname (line, argv[1], N + i, EXCEL_STYLE); 214 214 set_str_variable (line, argv[i+3]); 215 215 } 216 snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);216 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); 217 217 set_int_variable (line, N + i); 218 218 … … 231 231 char line2[MAX_LINE_LENGTH]; 232 232 233 snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]); // line = LIST:n233 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); // line = LIST:n 234 234 N = get_int_variable (line, &found); 235 235 236 236 // loop over all list elements: 237 237 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); 239 239 set_list_varname (line, argv[1], i, EXCEL_STYLE); // line = LIST:i 240 240 value = get_variable (line); … … 245 245 free (value); 246 246 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); 248 248 set_list_varname (line2, argv[1], j, EXCEL_STYLE); // line2 = LIST:j 249 249 next_value = get_variable (line2); … … 252 252 } 253 253 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) 255 255 set_int_variable (line, N - 1); 256 256 return (TRUE); … … 309 309 depth --; 310 310 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]); 312 312 set_int_variable (line, i); 313 313 free (input); … … 317 317 318 318 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); 320 320 set_list_varname (line, argv[1], i, EXCEL_STYLE); 321 321 set_str_variable (line, input); … … 381 381 free (val); 382 382 383 snprintf (line, MAX_LINE_LENGTH, "%s:n", listname);383 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", listname); 384 384 set_int_variable (line, i); 385 385 return (TRUE); … … 399 399 // otherwise save all glob matches 400 400 if (globList.gl_pathc == 0) { 401 snprintf (line, MAX_LINE_LENGTH, "%s:n", listname);401 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", listname); 402 402 set_int_variable (line, 0); 403 403 return TRUE; … … 409 409 set_str_variable (line, globList.gl_pathv[i]); 410 410 } 411 snprintf (line, MAX_LINE_LENGTH, "%s:n", listname);411 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", listname); 412 412 set_int_variable (line, Nfile); 413 413 return (TRUE); … … 430 430 Nline ++; 431 431 } 432 snprintf (varname, MAX_LINE_LENGTH, "%s:n", listname);432 snprintf_nowarn (varname, MAX_LINE_LENGTH, "%s:n", listname); 433 433 set_int_variable (varname, Nline); 434 434 return TRUE; … … 463 463 FREE (new); 464 464 } 465 snprintf (line, MAX_LINE_LENGTH, "%s:n", argv[1]);465 snprintf_nowarn (line, MAX_LINE_LENGTH, "%s:n", argv[1]); 466 466 set_int_variable (line, nWords); 467 467 -
branches/eam_branches/ipp-20220316/Ohana/src/opihi/cmd.data/cursor.c
r39457 r42345 42 42 KiiCursorRead (kapa, &X, &Y, &Z, &R, &D, key); 43 43 44 sprintf (string, "X%s", key); 45 set_variable (string, X); 46 sprintf (string, "Y%s", key); 47 set_variable (string, Y); 48 sprintf (string, "Z%s", key); 49 set_variable (string, Z); 50 sprintf (string, "R%s", key); 51 set_variable (string, R); 52 sprintf (string, "D%s", key); 53 set_variable (string, D); 44 snprintf_nowarn (string, 20, "X%s", key); set_variable (string, X); 45 snprintf_nowarn (string, 20, "Y%s", key); set_variable (string, Y); 46 snprintf_nowarn (string, 20, "Z%s", key); set_variable (string, Z); 47 snprintf_nowarn (string, 20, "R%s", key); set_variable (string, R); 48 snprintf_nowarn (string, 20, "D%s", key); set_variable (string, D); 54 49 55 50 set_str_variable ("KEY", key); -
branches/eam_branches/ipp-20220316/Ohana/src/opihi/dvo/coordmosaic.c
r39233 r42345 311 311 312 312 memset (segment, 0, 16); memcpy (segment, &SEGMENT[i*Nsegment], 4); 313 snprintf (name, 16, "%s_L_CX%dY%d", segment, XORDER[i], YORDER[i]);313 snprintf_nowarn (name, 16, "%s_L_CX%dY%d", segment, XORDER[i], YORDER[i]); 314 314 double xvalue = get_double_variable (name, &found); 315 315 xmask = !found; 316 316 317 317 memset (segment, 0, 16); memcpy (segment, &SEGMENT[i*Nsegment], 4); 318 snprintf (name, 16, "%s_M_CX%dY%d", segment, XORDER[i], YORDER[i]);318 snprintf_nowarn (name, 16, "%s_M_CX%dY%d", segment, XORDER[i], YORDER[i]); 319 319 double yvalue = get_double_variable (name, &found); 320 320 ymask = !found; … … 437 437 438 438 int found, xmask, ymask; 439 snprintf (name, 16, "L_X%dY%d", ix, iy);439 snprintf_nowarn (name, 16, "L_X%dY%d", ix, iy); 440 440 double xvalue = get_double_variable (name, &found); 441 441 xmask = !found; 442 442 443 snprintf (name, 16, "M_X%dY%d", ix, iy);443 snprintf_nowarn (name, 16, "M_X%dY%d", ix, iy); 444 444 double yvalue = get_double_variable (name, &found); 445 445 ymask = !found; -
branches/eam_branches/ipp-20220316/Ohana/src/opihi/dvo/elixir.c
r27611 r42345 4 4 int ReadMsg (char *fifo, char **message); 5 5 6 # define MY_MAX_PATH 256 7 6 8 int elixir (int argc, char **argv) { 7 9 8 char message[ 256], cmd[256], ElixirBase[256];9 char fifo[ 256], fifodir[256], msgfile[256];10 char message[MY_MAX_PATH], cmd[MY_MAX_PATH], ElixirBase[MY_MAX_PATH]; 11 char fifo[MY_MAX_PATH], fifodir[MY_MAX_PATH], msgfile[MY_MAX_PATH]; 10 12 char *answer; 11 13 int N; … … 38 40 return (FALSE); 39 41 } 40 s printf (fifo, "%s.msg", ElixirBase);42 snprintf_nowarn (fifo, MY_MAX_PATH, "%s.msg", ElixirBase); 41 43 if (!VarConfig ("FIFOS", "%s", fifodir)) { 42 44 gprint (GP_ERR, "FIFOS not in config, using local /tmp\n"); 43 45 strcpy (fifodir, "/tmp"); 44 46 } 45 s printf (fifo, "%s.msg", ElixirBase);47 snprintf_nowarn (fifo, MY_MAX_PATH, "%s.msg", ElixirBase); 46 48 47 s printf (msgfile, "%s/EMsg.XXXXXX", fifodir);49 snprintf_nowarn (msgfile, MY_MAX_PATH, "%s/EMsg.XXXXXX", fifodir); 48 50 if (mkstemp (msgfile) == -1) { 49 51 gprint (GP_ERR, "can't create fifo\n"); 50 52 return (FALSE); 51 53 } 52 s printf (message, "%s %s", cmd, msgfile);54 snprintf_nowarn (message, MY_MAX_PATH, "%s %s", cmd, msgfile); 53 55 unlink (msgfile); 54 56 -
branches/eam_branches/ipp-20220316/Ohana/src/opihi/pantasks/controller_status.c
r37807 r42345 26 26 } 27 27 28 snprintf (command, 1024, "status");28 snprintf_nowarn (command, 1024, "status"); 29 29 for (i = 1; i < argc; i++) { 30 snprintf (tmpline, 1024, "%s %s", command, argv[i]);30 snprintf_nowarn (tmpline, 1024, "%s %s", command, argv[i]); 31 31 strcpy (command, tmpline); 32 32 }
Note:
See TracChangeset
for help on using the changeset viewer.
