Commit 95a62c16 authored by Matteo Quintiliani's avatar Matteo Quintiliani
Browse files

Closing when nmxp_getMetaChannelList() returns NULL


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@893 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent d4bb09c6
Loading
Loading
Loading
Loading
+5 −2
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@
 * 	Istituto Nazionale di Geofisica e Vulcanologia - Italy
 * 	Istituto Nazionale di Geofisica e Vulcanologia - Italy
 *	quintiliani@ingv.it
 *	quintiliani@ingv.it
 *
 *
 * $Id: nmxptool.c,v 1.148 2008-03-05 11:02:18 mtheo Exp $
 * $Id: nmxptool.c,v 1.149 2008-03-07 17:32:20 mtheo Exp $
 *
 *
 */
 */


@@ -231,7 +231,10 @@ int main (int argc, char **argv) {
    /* Get list of available channels and get a subset list of params.channels */
    /* Get list of available channels and get a subset list of params.channels */
    if( DAP_CONDITION(params) ) {
    if( DAP_CONDITION(params) ) {
	/* From DataServer */
	/* From DataServer */
	nmxp_getMetaChannelList(params.hostname, params.portnumberdap, NMXP_DATA_TIMESERIES, params.flag_request_channelinfo, params.datas_username, params.datas_password, &channelList);
	if(!nmxp_getMetaChannelList(params.hostname, params.portnumberdap, NMXP_DATA_TIMESERIES,
		    params.flag_request_channelinfo, params.datas_username, params.datas_password, &channelList)) {
	    return -1;
	}
    } else {
    } else {
	/* From NaqsServer */
	/* From NaqsServer */
	channelList = nmxp_getAvailableChannelList(params.hostname, params.portnumberpds, NMXP_DATA_TIMESERIES);
	channelList = nmxp_getAvailableChannelList(params.hostname, params.portnumberpds, NMXP_DATA_TIMESERIES);