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:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/libdvo/include/dvodb.h

    r42075 r42389  
    150150
    151151/* measure fields */
    152 enum {MEAS_ZERO,
     152typedef enum {MEAS_ZERO,
    153153      MEAS_GLON,
    154154      MEAS_GLAT,
    … …  
    312312
    313313/* average fields */
    314 enum {AVE_ZERO,
     314typedef enum {AVE_ZERO,
    315315      AVE_RA,
    316316      AVE_DEC,
    … …  
    376376//       AVE_Xm,
    377377
    378 enum {IMAGE_ZERO,
     378typedef enum {IMAGE_ZERO,
    379379      IMAGE_RA,
    380380      IMAGE_DEC,

  • trunk/Ohana/src/libdvo/src/coordops.c

    r42075 r42389  
    888888 
    889889  int OldAIPS;
    890   char csys[16], ctype[16];
     890  char csys[16], ctype[32];
    891891  double rotate, Lambda;
    892892
    … …  
    906906    if (!strncmp (coords[0].ctype, "SLAT", 4)) strcpy (csys, "SLON");
    907907    if (!strcmp (csys, "NONE")) return (FALSE);
    908     snprintf (ctype, 16, "%s-%s", csys, &coords[0].ctype[5]);
     908    snprintf (ctype, 32, "%s-%s", csys, &coords[0].ctype[5]);
    909909    gfits_modify (header, "CTYPE1",   "%s",  1, ctype);
    910910  }   

  • trunk/Ohana/src/libdvo/src/dbFields.c

    r42102 r42389  
    640640  if (!strcasecmp (fieldName, "PSF_QF"))         ESCAPE (MEAS_PSF_QF,         OPIHI_FLT);
    641641  if (!strcasecmp (fieldName, "PSF_QF_PERFECT")) ESCAPE (MEAS_PSF_QF_PERFECT, OPIHI_FLT);
     642  if (!strcasecmp (fieldName, "PSFQF"))          ESCAPE (MEAS_PSF_QF,         OPIHI_FLT);
     643  if (!strcasecmp (fieldName, "PSFQF_PERFECT"))  ESCAPE (MEAS_PSF_QF_PERFECT, OPIHI_FLT);
     644  if (!strcasecmp (fieldName, "PSFQFPERFECT"))   ESCAPE (MEAS_PSF_QF_PERFECT, OPIHI_FLT);
    642645  if (!strcasecmp (fieldName, "PSF_CHISQ"))      ESCAPE (MEAS_PSF_CHISQ,      OPIHI_FLT);
    643646  if (!strcasecmp (fieldName, "PSF_NDOF"))       ESCAPE (MEAS_PSF_NDOF,       OPIHI_INT);

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c

    r40291 r42389  
    230230
    231231    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    232     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    233     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     232    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    234233
    235234    out[i].tzero            = in[i].tzero;
    … …  
    302301
    303302    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    304     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    305     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     303    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    306304
    307305    out[i].tzero            = in[i].tzero;
    … …  
    358356
    359357  for (i = 0; i < Nvalues; i++) {
    360     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    361     out[i].name[31] = 0; // force termination
     358    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    362359
    363360    out[i].code  = in[i].code;         
    … …  
    397394
    398395  for (i = 0; i < Nvalues; i++) {
    399     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    400     out[i].name[31] = 0; // force termination
     396    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    401397
    402398    out[i].code = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

    r40291 r42389  
    225225
    226226    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    227     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    228     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     227    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    229228
    230229    out[i].tzero            = in[i].tzero;
    … …  
    294293
    295294    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    296     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    297     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     295    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    298296
    299297    out[i].tzero            = in[i].tzero;
    … …  
    353351
    354352  for (i = 0; i < Nvalues; i++) {
    355     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    356     out[i].name[31] = 0; // force termination
     353    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    357354
    358355    out[i].code  = in[i].code;         
    … …  
    390387
    391388  for (i = 0; i < Nvalues; i++) {
    392     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    393     out[i].name[31] = 0; // force termination
     389    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    394390
    395391    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c

    r40291 r42389  
    2424
    2525    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    26     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    27     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     26    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    2827
    2928    out[i].tzero            = in[i].tzero;
    … …  
    8887
    8988    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    90     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    91     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     89    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    9290
    9391    out[i].tzero            = in[i].tzero;
    … …  
    146144
    147145  for (i = 0; i < Nvalues; i++) {
    148     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    149     out[i].name[31] = 0; // force termination
     146    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    150147
    151148    out[i].code  = in[i].code;         
    … …  
    182179
    183180  for (i = 0; i < Nvalues; i++) {
    184     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    185     out[i].name[31] = 0; // force termination
     181    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    186182
    187183    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c

    r40291 r42389  
    153153
    154154    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    155     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    156     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     155    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    157156
    158157    out[i].tzero            = in[i].tzero;
    … …  
    220219
    221220    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    222     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    223     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     221    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    224222
    225223    out[i].tzero            = in[i].tzero;
    … …  
    277275
    278276  for (i = 0; i < Nvalues; i++) {
    279     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    280     out[i].name[31] = 0; // force termination
     277    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    281278
    282279    out[i].code  = in[i].code;         
    … …  
    313310
    314311  for (i = 0; i < Nvalues; i++) {
    315     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    316     out[i].name[31] = 0; // force termination
     312    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    317313
    318314    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_SIM.c

    r40291 r42389  
    313313
    314314    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
    315     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    316     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     315    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    317316
    318317    out[i].tzero            = in[i].tzero;
    … …  
    382381
    383382    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
    384     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    385     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     383    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    386384
    387385    out[i].tzero            = in[i].tzero;

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

    r40291 r42389  
    249249
    250250    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    251     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    252     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     251    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    253252
    254253    out[i].tzero            = in[i].tzero;
    … …  
    317316
    318317    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    319     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    320     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     318    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    321319
    322320    out[i].tzero            = in[i].tzero;
    … …  
    375373
    376374  for (i = 0; i < Nvalues; i++) {
    377     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    378     out[i].name[31] = 0; // force termination
     375    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    379376
    380377    out[i].code  = in[i].code;         
    … …  
    411408
    412409  for (i = 0; i < Nvalues; i++) {
    413     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    414     out[i].name[31] = 0; // force termination
     410    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    415411
    416412    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c

    r40291 r42389  
    260260
    261261    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    262     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    263     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     262    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    264263
    265264    out[i].tzero            = in[i].tzero;
    … …  
    328327
    329328    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    330     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    331     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     329    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    332330
    333331    out[i].tzero            = in[i].tzero;
    … …  
    391389
    392390  for (i = 0; i < Nvalues; i++) {
    393     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    394     out[i].name[31] = 0; // force termination
     391    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    395392
    396393    out[i].code  = in[i].code;         
    … …  
    427424
    428425  for (i = 0; i < Nvalues; i++) {
    429     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    430     out[i].name[31] = 0; // force termination
     426    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    431427
    432428    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c

    r40291 r42389  
    270270
    271271    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    272     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    273     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     272    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    274273
    275274    out[i].tzero            = in[i].tzero;
    … …  
    338337
    339338    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    340     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    341     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     339    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    342340
    343341    out[i].tzero            = in[i].tzero;
    … …  
    401399
    402400  for (i = 0; i < Nvalues; i++) {
    403     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    404     out[i].name[31] = 0; // force termination
     401    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    405402
    406403    out[i].code  = in[i].code;         
    … …  
    437434
    438435  for (i = 0; i < Nvalues; i++) {
    439     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    440     out[i].name[31] = 0; // force termination
     436    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    441437
    442438    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c

    r40291 r42389  
    308308
    309309    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    310     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    311     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     310    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    312311
    313312    out[i].tzero            = in[i].tzero;
    … …  
    376375
    377376    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
    378     strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    379     out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
     377    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
    380378
    381379    out[i].tzero            = in[i].tzero;
    … …  
    439437
    440438  for (i = 0; i < Nvalues; i++) {
    441     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    442     out[i].name[31] = 0; // force termination
     439    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    443440
    444441    out[i].code  = in[i].code;         
    … …  
    475472
    476473  for (i = 0; i < Nvalues; i++) {
    477     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    478     out[i].name[31] = 0; // force termination
     474    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    479475
    480476    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

    r40291 r42389  
    11341134
    11351135    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
    1136     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    1137     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     1136    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    11381137
    11391138    out[i].tzero            = in[i].tzero;
    … …  
    12031202
    12041203    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
    1205     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    1206     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     1204    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    12071205
    12081206    out[i].tzero            = in[i].tzero;
    … …  
    12671265
    12681266  for (i = 0; i < Nvalues; i++) {
    1269     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    1270     out[i].name[31] = 0; // force termination
     1267    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    12711268
    12721269    out[i].code  = in[i].code;         
    … …  
    13031300
    13041301  for (i = 0; i < Nvalues; i++) {
    1305     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    1306     out[i].name[31] = 0; // force termination
     1302    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    13071303
    13081304    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5_LOAD.c

    r40291 r42389  
    645645
    646646    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
    647     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    648     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     647    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    649648
    650649    out[i].tzero            = in[i].tzero;
    … …  
    714713
    715714    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
    716     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    717     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     715    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    718716
    719717    out[i].tzero            = in[i].tzero;
    … …  
    778776
    779777  for (i = 0; i < Nvalues; i++) {
    780     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    781     out[i].name[31] = 0; // force termination
     778    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    782779
    783780    out[i].code  = in[i].code;         
    … …  
    814811
    815812  for (i = 0; i < Nvalues; i++) {
    816     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    817     out[i].name[31] = 0; // force termination
     813    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    818814
    819815    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V6.c

    r40291 r42389  
    860860
    861861    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
    862     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    863     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     862    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    864863
    865864    out[i].tzero            = in[i].tzero;
    … …  
    927926
    928927    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
    929     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    930     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     928    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    931929
    932930    out[i].tzero            = in[i].tzero;
    … …  
    990988
    991989  for (i = 0; i < Nvalues; i++) {
    992     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    993     out[i].name[31] = 0; // force termination
     990    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    994991
    995992    out[i].code  = in[i].code;         
    … …  
    10261023
    10271024  for (i = 0; i < Nvalues; i++) {
    1028     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    1029     out[i].name[31] = 0; // force termination
     1025    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    10301026
    10311027    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c

    r40291 r42389  
    217217
    218218    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    219     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    220     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     219    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    221220
    222221    out[i].tzero            = in[i].tzero;
    … …  
    291290
    292291    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    293     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    294     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     292    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    295293
    296294    out[i].tzero            = in[i].tzero;
    … …  
    346344
    347345  for (i = 0; i < Nvalues; i++) {
    348     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    349     out[i].name[31] = 0; // force termination
     346    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    350347
    351348    out[i].code  = in[i].code;         
    … …  
    386383
    387384  for (i = 0; i < Nvalues; i++) {
    388     strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
    389     out[i].name[31] = 0; // force termination
     385    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
    390386
    391387    out[i].code  = in[i].code;         

  • trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c

    r40291 r42389  
    195195
    196196    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    197     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    198     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     197    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    199198
    200199    out[i].tzero            = in[i].tzero;
    … …  
    270269
    271270    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    272     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    273     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     271    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    274272
    275273    out[i].tzero            = in[i].tzero;

  • trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

    r40291 r42389  
    238238
    239239    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    240     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    241     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     240    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    242241
    243242    out[i].tzero            = in[i].tzero;
    … …  
    312311
    313312    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    314     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    315     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     313    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    316314
    317315    out[i].tzero            = in[i].tzero;

  • trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

    r40291 r42389  
    238238
    239239    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    240     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    241     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     240    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    242241
    243242    out[i].tzero            = in[i].tzero;
    … …  
    312311
    313312    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
    314     strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    315     out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
     313    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
    316314
    317315    out[i].tzero            = in[i].tzero;

  • trunk/Ohana/src/libdvo/src/skydb.c

    r38553 r42389  
    275275      new[Nnew].depth = 2;
    276276      new[Nnew].child = FALSE;
    277       strncpy (root, db[i].name, 5); root[5] = 0;
     277      strncpy_nowarn (root, db[i].name, 5);
    278278      myAssert (snprintf (new[Nnew].name, 18, "%s/r%04d.cpt", root, Rnumber) < 18, "overflow");
    279279      Rnumber ++;     
    … …  
    364364        db[N].depth = 3;
    365365        db[N].child = FALSE;
    366         strncpy (root, db[i].name, 10); root[10] = 0;
     366        strncpy_nowarn (root, db[i].name, 10);
    367367        myAssert (snprintf (db[N].name, 18, "%s.%02d.cpt", root, Rnumber) < 18, "overflow");
    368368        Rnumber ++;

  • trunk/Ohana/src/libdvo/src/skyregion_gsc.c

    r41738 r42389  
    247247  int i;
    248248  double Rmin, Rmax, Dmin, Dmax;
    249   char temp[80], name[80];
     249  char temp[50], name[80];
    250250  SkyTable *band;
    251251  SkyRegion *regions;
    … …  
    254254  ALLOCATE (regions, SkyRegion, Nregions);
    255255  for (i = 0; i < Nregions; i++) {
    256     strncpy (temp, &buffer[i*48], 48);
    257     temp[48] = 0;
     256    strncpy_nowarn (temp, &buffer[i*48], 48);
    258257    hstgsc_hms_to_deg (&Rmin, &Rmax, &Dmin, &Dmax, &temp[7]);
    259258    if (Dmax < Dmin) SWAP (Dmin, Dmax);
Note: See TracChangeset for help on using the changeset viewer.