IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34058


Ignore:
Timestamp:
Jun 23, 2012, 6:57:16 AM (14 years ago)
Author:
eugene
Message:

fix build-time warnings

Location:
branches/eam_branches/ipp-20120601
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20120601/ippTools/src/dettool.c

    r31205 r34058  
    21162116  PS_ASSERT_PTR_NON_NULL(config, NULL);
    21172117
    2118   PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true,  false);
     2118  // replaced below PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true,  false);
    21192119  PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
    21202120  PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);

  • branches/eam_branches/ipp-20120601/ippTools/src/dettool_processedexp.c

    r28578 r34058  
    266266    PS_ASSERT_PTR_NON_NULL(config, NULL);
    267267
    268     PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     268    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
    269269    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
    270270
    … …  
    283283bool updatestateprocessedMode(pxConfig *config) {
    284284  PS_ASSERT_PTR_NON_NULL(config, NULL);
    285   PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
     285  // PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
    286286  PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
    287287

  • branches/eam_branches/ipp-20120601/ippTools/src/dettool_processedimfile.c

    r28578 r34058  
    298298    PS_ASSERT_PTR_NON_NULL(config, NULL);
    299299
    300     PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     300    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
    301301    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
    302302

  • branches/eam_branches/ipp-20120601/ippTools/src/dettool_residexp.c

    r28578 r34058  
    356356bool updatestateresidMode(pxConfig *config) {
    357357  PS_ASSERT_PTR_NON_NULL(config, NULL);
    358   PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
     358  // PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
    359359  PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
    360360

  • branches/eam_branches/ipp-20120601/ippTools/src/disttool.c

    r33042 r34058  
    403403    }
    404404
     405    if (0) {
     406        fprintf (stderr, "runJoinStr: %s\n", runJoinStr);
     407    }
     408
    405409    if (!strcmp(stage, "raw")) {
    406410        if (!no_magic) {
    … …  
    726730    }
    727731
     732    if (simple) {/* no option? */}
    728733
    729734    if (pretend) {
    … …  
    18331838        psStringAppend(&query, " %s last_fileset = '%s'", sep, last_fileset);
    18341839    }
     1840#else
     1841    if (0) { fprintf (stderr, "sep: %s\n", sep); }
    18351842#endif
    18361843
    … …  
    21862193    PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
    21872194
    2188     PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
    2189     PXOPT_LOOKUP_BOOL(full, config->args, "-full", false);
     2195    // PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
     2196    // PXOPT_LOOKUP_BOOL(full, config->args, "-full", false);
    21902197
    21912198    pxAddLabelSearchArgs (config, where, "-label", "distRun.label", "==");

  • branches/eam_branches/ipp-20120601/ippTools/src/dqstatstool.c

    r31969 r34058  
    829829static bool updaterunMode(pxConfig *config) {
    830830  PS_ASSERT_PTR_NON_NULL(config,false);
    831   PXOPT_LOOKUP_S64(dqstats_id, config->args, "-dqstats_id",     true, false);
     831  // PXOPT_LOOKUP_S64(dqstats_id, config->args, "-dqstats_id",     true, false);
    832832  PXOPT_LOOKUP_STR(state,      config->args, "-set_state",      true, false);
    833833  PXOPT_LOOKUP_S16(fault,      config->args, "-fault",          false, false);

  • branches/eam_branches/ipp-20120601/ippTools/src/faketool.c

    r32943 r34058  
    12631263  PS_ASSERT_PTR_NON_NULL(config, NULL);
    12641264
    1265   PXOPT_LOOKUP_S64(det_id, config->args, "-fake_id", true,  false);
     1265  // PXOPT_LOOKUP_S64(det_id, config->args, "-fake_id", true,  false);
    12661266  PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
    12671267  PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);

  • branches/eam_branches/ipp-20120601/ippTools/src/laptool.c

    r33336 r34058  
    464464
    465465  psMetadata *where = psMetadataAlloc();
    466   PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
     466
     467  // require? PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
    467468  PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "==");
    468469
    … …  
    633634{
    634635  PS_ASSERT_PTR_NON_NULL(config, false);
    635   PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
    636 
     636
     637  // require? PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
    637638  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    638639  PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    705706
    706707  psMetadata *where = psMetadataAlloc();
    707   PXOPT_LOOKUP_S64(lap_id,  config->args, "-lap_id",  true, false);
    708   PXOPT_LOOKUP_S64(exp_id,  config->args, "-exp_id",  true, false);
    709   PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
     708
     709  // test for required opts?
     710  // PXOPT_LOOKUP_S64(lap_id,  config->args, "-lap_id",  true, false);
     711  // PXOPT_LOOKUP_S64(exp_id,  config->args, "-exp_id",  true, false);
     712  // PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
    710713
    711714  PXOPT_LOOKUP_S64(set_chip_id, config->args, "-set_chip_id", false, false);
    … …  
    841844{
    842845  PS_ASSERT_PTR_NON_NULL(config, false);
    843   PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
     846
     847  // PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
    844848 
    845849  psMetadata *where = psMetadataAlloc();

  • branches/eam_branches/ipp-20120601/ippTools/src/magicdstool.c

    r33625 r34058  
    13431343{
    13441344    // required
    1345     PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
     1345    // PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
    13461346
    13471347    psMetadata *where = psMetadataAlloc();

  • branches/eam_branches/ipp-20120601/ippTools/src/mergetool.c

    r33030 r34058  
    738738    PS_ASSERT_PTR_NON_NULL(config, NULL);
    739739    psMetadata *where = psMetadataAlloc();
    740     PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
     740    // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
    741741    PXOPT_COPY_S64(config->args, where, "-merge_id",     "mergedvodbProcessed.merge_id", "==");
    742742    PXOPT_LOOKUP_F32(dtime_merge,  config->args, "-set_dtime_merge", false, false);
    … …  
    11391139  PS_ASSERT_PTR_NON_NULL(config, false);
    11401140  psMetadata *where = psMetadataAlloc();
    1141   PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
    1142   PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
     1141
     1142  // require? PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
     1143  // require? PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
    11431144  PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
    11441145  PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
    11451146  PXOPT_LOOKUP_STR(rsync_path,  config->args, "-mergedvodb_rsync_path", false, false);
    1146   PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
     1147  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
    11471148 
    11481149  PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);

  • branches/eam_branches/ipp-20120601/ippTools/src/minidvodbtool.c

    r33030 r34058  
    411411  PS_ASSERT_PTR_NON_NULL(config, false);
    412412  psMetadata *where = psMetadataAlloc();
    413   PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
    414   PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
     413
     414  // PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
     415  // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
    415416  PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
    416417  PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
    417418  PXOPT_LOOKUP_STR(rsync_path,  config->args, "-minidvodb_rsync_path", false, false);
    418   PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
     419  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
    419420 
    420421  PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);

  • branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c

    r34052 r34058  
    4848static bool stopdependentjobMode(pxConfig *config);
    4949static bool revertjobMode(pxConfig *config);
     50
     51# if (0)
     52// these are unused functions -- since they are 'static', this raises an warning
    5053static bool addprojectMode(pxConfig *config);
    5154static bool projectMode(pxConfig *config);
    … …  
    5962static bool listfileMode(pxConfig *config);
    6063static bool deletefileMode(pxConfig *config);
     64# endif
    6165
    6266# define MODECASE(caseName, func) \
    … …  
    98102        MODECASE(PSTAMPTOOL_MODE_STOPDEPENDENTJOB, stopdependentjobMode);
    99103        MODECASE(PSTAMPTOOL_MODE_REVERTJOB, revertjobMode);
     104# if (0)
    100105        MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addprojectMode);
    101106        MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modprojectMode);
    … …  
    109114        MODECASE(PSTAMPTOOL_MODE_LISTFILE, listfileMode);
    110115        MODECASE(PSTAMPTOOL_MODE_DELETEFILE, deletefileMode);
     116# endif
    111117        default:
    112118            psAbort("invalid option (this should not happen)");
    … …  
    10951101}
    10961102
     1103# if (0)
     1104// these are unused functions
    10971105static bool addprojectMode(pxConfig *config)
    10981106{
    … …  
    16341642    return true;
    16351643}
     1644# endif

  • branches/eam_branches/ipp-20120601/ippTools/src/pztool.c

    r33533 r34058  
    338338        }
    339339
    340 /*         psStringAppend(&query, " ORDER BY dateobs"); */
    341 /*         if (desc) { */
    342 /*             psStringAppend(&query, " DESC"); */
    343 /*         } */
     340        if (0) {
     341            psStringAppend(&query, " ORDER BY dateobs");
     342            if (desc) {
     343                psStringAppend(&query, " DESC");
     344            }
     345        }
    344346
    345347        // request the full "limit" from each known camera and throw away any

  • branches/eam_branches/ipp-20120601/ippTools/src/regtool.c

    r32593 r34058  
    613613    PXOPT_LOOKUP_F32(teltemp_extra, config->args, "-teltemp_extra", false, false);
    614614    PXOPT_LOOKUP_F32(pon_time, config->args, "-pon_time", false, false);
    615     PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
     615    // PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
    616616    PXOPT_LOOKUP_F64(user_1, config->args, "-user_1", false, false);
    617617    PXOPT_LOOKUP_F64(user_2, config->args, "-user_2", false, false);
    … …  
    16641664  PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
    16651665
    1666   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     1666  // XXX unused PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    16671667
    16681668  psString query = pxDataGet("regtool_finishcompressexp.sql");
    … …  
    17921792  psStringPrepend(&whereClause,"\n AND ");
    17931793  PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    1794   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     1794  // PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    17951795
    17961796  psString limitString = NULL;
    … …  
    20332033  PS_ASSERT_PTR_NON_NULL(config, NULL);
    20342034
    2035   PXOPT_LOOKUP_S64(det_id, config->args, "-exp_id", true,  false);
     2035  // unused and wrong! PXOPT_LOOKUP_S64(det_id, config->args, "-exp_id", true,  false);
    20362036  PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
    20372037  PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);

  • branches/eam_branches/ipp-20120601/ippTools/src/stacktool.c

    r33821 r34058  
    810810
    811811    // XXX require at least a stack id (add better search options)
    812     PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
     812    // PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
    813813
    814814    psMetadata *where = psMetadataAlloc();
    … …  
    16971697  PS_ASSERT_PTR_NON_NULL(config, NULL);
    16981698
    1699   PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
     1699  // PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
    17001700  PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
    17011701  PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);

  • branches/eam_branches/ipp-20120601/ippTools/src/staticskytool.c

    r33919 r34058  
    424424
    425425    // XXX require at least a sky id (add better search options)
    426     PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
     426    // PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
    427427
    428428    psMetadata *where = psMetadataAlloc();
    … …  
    797797  PS_ASSERT_PTR_NON_NULL(config, NULL);
    798798
    799   PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
     799  // XXX unused PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
    800800  PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
    801801  PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);

  • branches/eam_branches/ipp-20120601/ippTools/src/vptool.c

    r32770 r34058  
    126126        }
    127127
    128         GET_VALUE (psS64,    S64, exp_id,        "exp_id");
     128        // GET_VALUE (psS64,    S64, exp_id,        "exp_id");
    129129        GET_VALUE (psString, Str, raw_workdir,   "workdir");
    130130        GET_VALUE (psString, Str, raw_label,     "label");
    131         GET_VALUE (psString, Str, raw_reduction, "reduction");
     131        // GET_VALUE (psString, Str, raw_reduction, "reduction");
    132132        // GET_VALUE (psString, Str, raw_expgroup,  "expgroup");
    133         GET_VALUE (psString, Str, raw_dvodb,     "dvodb");
    134         GET_VALUE (psString, Str, raw_tess_id,   "tess_id");
    135         GET_VALUE (psString, Str, raw_end_stage, "end_stage");
     133        // GET_VALUE (psString, Str, raw_dvodb,     "dvodb");
     134        // GET_VALUE (psString, Str, raw_tess_id,   "tess_id");
     135        // GET_VALUE (psString, Str, raw_end_stage, "end_stage");
    136136
    137137        if (!row->exp_id) {
    … …  
    672672    PXOPT_COPY_S16(config->args, where, "-fault", "vpProcessedCell.fault", "==");
    673673
    674     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
     674    // PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
    675675
    676676    if (!psListLength(where->list)) {

  • branches/eam_branches/ipp-20120601/ippTools/src/warptool.c

    r33112 r34058  
    11851185    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
    11861186
    1187     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     1187    // PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    11881188
    11891189    psString query = pxDataGet("warptool_finished_run_select.sql");
    … …  
    18311831    PS_ASSERT_PTR_NON_NULL(config, NULL);
    18321832
    1833     PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
     1833    // PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
    18341834    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    18351835    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    … …  
    21692169    PS_ASSERT_PTR_NON_NULL(config, NULL);
    21702170
    2171     PXOPT_LOOKUP_S64(det_id,  config->args, "-warp_id", true,  false);
     2171    // PXOPT_LOOKUP_S64(det_id,  config->args, "-warp_id", true,  false);
    21722172    PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
    21732173    PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
    … …  
    23582358    pxAddLabelSearchArgs (config, where, "-label",     "warpRun.label", "LIKE");
    23592359
    2360 //    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
    2361     PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
     2360    // PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
     2361    // PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
    23622362
    23632363    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);

  • branches/eam_branches/ipp-20120601/magic/remove/src/streakscompare.c

    r30315 r34058  
    165165    }
    166166
     167    if (nebulousImage) { /* do something? */ }
     168
    167169    if (argc != 1) {
    168170        psString unexpectedArguments = NULL;

  • branches/eam_branches/ipp-20120601/magic/remove/src/streaksio.c

    r32687 r34058  
    659659
    660660        // Ensure input is of the expected type
    661         psDataType expected = isMask ? PS_TYPE_IMAGE_MASK : PS_TYPE_F32; // Expected type for image
     661        psElemType expected = isMask ? PS_TYPE_IMAGE_MASK : PS_TYPE_F32; // Expected type for image
    662662        for (int i = 0; i < in->imagecube->n; i++) {
    663663            psImage *image = in->imagecube->data[i]; // Image of interest

  • branches/eam_branches/ipp-20120601/magic/remove/src/streaksrelease.c

    r30315 r34058  
    288288    } else {
    289289        // we have an image cube
    290         double initValue;
     290        // double initValue;
    291291        if (exciseImageCube) {
    292292            // copy the entire input image to the recovery image
    293293            writeImageCube(sf->recImage, sf->inImage->imagecube, extname, sf->extnum);
    294             initValue = NAN;
     294            // initValue = NAN;
    295295        } else {
    296296            // otherwise write it to the output
    297297            writeImageCube(sf->outImage, sf->inImage->imagecube, extname, sf->extnum);
    298             initValue = 0;
     298            // initValue = 0;
    299299        }
    300300

  • branches/eam_branches/ipp-20120601/psLib/src/imageops/psImageStructManip.c

    r34052 r34058  
    212212    elementSize = PSELEMTYPE_SIZEOF(inDatatype);
    213213
    214     if (0) { fprintf (stderr, "%d elements, %d total memory\n", elements, elements * elementsSize); }
     214    if (0) { fprintf (stderr, "%d elements, %d total memory\n", elements, elements * elementSize); }
    215215
    216216    output = p_psImageRecycle(file, lineno, func, output, numCols, numRows, type);
Note: See TracChangeset for help on using the changeset viewer.