Changeset 10797 for trunk


Ignore:
Timestamp:
05/24/11 17:37:21 (14 years ago)
Author:
tbretz
Message:
Simplified program options handling.
Location:
trunk/FACT++/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/src/fitsdump.cc

    r10793 r10797  
    66 */
    77 //****************************************************************
    8 #include "FACT.h"
    98#include "Configuration.h"
    109
    … …  
    586585    }
    587586
    588     if (conf.HasPrint())
     587    if (conf.HasVersion() || conf.HasPrint())
    589588        return -1;
    590     if (conf.HasVersion())
    591     {
    592         FACT::PrintVersion(argv[0]);
    593         return -1;
    594     }
    595589
    596590    if (conf.HasHelp())

  • trunk/FACT++/src/scheduler.cc

    r10780 r10797  
    1414#include <mysql++/mysql++.h>
    1515
    16 #include "FACT.h"
    1716#include "Dim.h"
    1817#include "Time.h"
    … …  
    824823    }
    825824
    826     if (conf.HasPrint())
     825    if (conf.HasVersion() || conf.HasPrint())
    827826        return -1;
    828 
    829     if (conf.HasVersion())
    830     {
    831         FACT::PrintVersion(argv[0]);
    832         return -1;
    833     }
    834827
    835828    if (conf.HasHelp())

  • trunk/FACT++/src/triggerschedule.cc

    r10765 r10797  
    22#include <dic.hxx>
    33
    4 #include "FACT.h"
    54#include "Dim.h"
    65#include "Configuration.h"
    … …  
    8483    }
    8584
    86     if (conf.HasPrint())
     85    if (conf.HasVersion() || conf.HasPrint())
    8786        return -1;
    88 
    89     if (conf.HasVersion())
    90     {
    91         FACT::PrintVersion(argv[0]);
    92         return -1;
    93     }
    9487
    9588    if (conf.HasHelp())
Note: See TracChangeset for help on using the changeset viewer.