Commit 579860ee authored by Matteo Quintiliani's avatar Matteo Quintiliani
Browse files

Minor change: renamed n_usec to usec


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@940 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent 182f6562
...@@ -7,7 +7,7 @@ ...@@ -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.153 2008-03-19 08:16:03 mtheo Exp $ * $Id: nmxptool.c,v 1.154 2008-03-20 06:54:55 mtheo Exp $
* *
*/ */
...@@ -745,7 +745,7 @@ int main (int argc, char **argv) { ...@@ -745,7 +745,7 @@ int main (int argc, char **argv) {
/* PDS Step 5: Send AddChannels */ /* PDS Step 5: Send AddChannels */
/* Request Data */ /* Request Data */
nmxp_sendAddTimeSeriesChannel(naqssock, channelList_subset, params.stc, params.rate, nmxp_sendAddTimeSeriesChannel(naqssock, channelList_subset, params.stc, params.rate,
(params.flag_buffered)? NMXP_BUFFER_YES : NMXP_BUFFER_NO, params.n_channel, params.n_usec, 1); (params.flag_buffered)? NMXP_BUFFER_YES : NMXP_BUFFER_NO, params.n_channel, params.usec, 1);
/* PDS Step 6: Repeat until finished: receive and handle packets */ /* PDS Step 6: Repeat until finished: receive and handle packets */
...@@ -952,7 +952,7 @@ int main (int argc, char **argv) { ...@@ -952,7 +952,7 @@ int main (int argc, char **argv) {
} }
#endif #endif
nmxp_sendAddTimeSeriesChannel(naqssock, channelList_subset, params.stc, params.rate, nmxp_sendAddTimeSeriesChannel(naqssock, channelList_subset, params.stc, params.rate,
(params.flag_buffered)? NMXP_BUFFER_YES : NMXP_BUFFER_NO, params.n_channel, params.n_usec, 0); (params.flag_buffered)? NMXP_BUFFER_YES : NMXP_BUFFER_NO, params.n_channel, params.usec, 0);
} /* End main PDS loop */ } /* End main PDS loop */
......
...@@ -7,7 +7,7 @@ ...@@ -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_getoptlong.c,v 1.85 2008-03-19 20:42:18 mtheo Exp $ * $Id: nmxptool_getoptlong.c,v 1.86 2008-03-20 06:54:55 mtheo Exp $
* *
*/ */
...@@ -699,7 +699,7 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params) ...@@ -699,7 +699,7 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params)
if(sep) { if(sep) {
sep[0] = 0; sep[0] = 0;
sep++; sep++;
params->n_usec = atoi(optarg) * 1000; params->usec = atoi(optarg) * 1000;
params->n_channel = atoi(sep); params->n_channel = atoi(sep);
} else { } else {
/* /*
...@@ -708,7 +708,7 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params) ...@@ -708,7 +708,7 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params)
ret_errors++; ret_errors++;
} }
nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY,
"Channels %d usec %d!\n", params->n_channel, params->n_usec); "Channels %d usec %d!\n", params->n_channel, params->usec);
break; break;
case 'g': case 'g':
...@@ -979,7 +979,7 @@ int nmxptool_check_params(NMXPTOOL_PARAMS *params) { ...@@ -979,7 +979,7 @@ int nmxptool_check_params(NMXPTOOL_PARAMS *params) {
nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, "<timeoutrecv> ignored since not defined --stc=-1.\n"); nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, "<timeoutrecv> ignored since not defined --stc=-1.\n");
} }
if(params->n_usec < DEFAULT_USEC_MINIMUM || params->n_usec > DEFAULT_USEC_MAXIMUM) { if(params->usec < DEFAULT_USEC_MINIMUM || params->usec > DEFAULT_USEC_MAXIMUM) {
ret = -1; ret = -1;
nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, "ms in <mschan> has to be within [%d..%d].\n", nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, "ms in <mschan> has to be within [%d..%d].\n",
DEFAULT_USEC_MINIMUM/1000, DEFAULT_USEC_MAXIMUM/1000); DEFAULT_USEC_MINIMUM/1000, DEFAULT_USEC_MAXIMUM/1000);
......
...@@ -7,7 +7,7 @@ ...@@ -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_getoptlong.h,v 1.96 2008-03-19 20:42:18 mtheo Exp $ * $Id: nmxptool_getoptlong.h,v 1.97 2008-03-20 06:54:55 mtheo Exp $
* *
*/ */
...@@ -90,7 +90,7 @@ typedef struct { ...@@ -90,7 +90,7 @@ typedef struct {
char *statefile; char *statefile;
double buffered_time; double buffered_time;
int n_channel; int n_channel;
int n_usec; int usec;
int32_t max_data_to_retrieve; int32_t max_data_to_retrieve;
int flag_writeseed; int flag_writeseed;
int flag_listchannels; int flag_listchannels;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment