Rename "null" state boolean to "null_terminated_lines" so it is more descriptive and less confusing.
This commit is contained in:
+2
-2
@@ -191,7 +191,7 @@ int main(int argc, char **argv)
|
||||
*/
|
||||
if (0 == opts->size) {
|
||||
pv_state_linemode_set(state, opts->linemode);
|
||||
pv_state_null_set(state, opts->null);
|
||||
pv_state_null_terminated_lines_set(state, opts->null_terminated_lines);
|
||||
opts->size = pv_calc_total_size(state);
|
||||
debug("%s: %llu", "no size given - calculated", opts->size);
|
||||
}
|
||||
@@ -268,7 +268,7 @@ int main(int argc, char **argv)
|
||||
pv_state_delay_start_set(state, opts->delay_start);
|
||||
pv_state_linemode_set(state, opts->linemode);
|
||||
pv_state_bits_set(state, opts->bits);
|
||||
pv_state_null_set(state, opts->null);
|
||||
pv_state_null_terminated_lines_set(state, opts->null_terminated_lines);
|
||||
pv_state_skip_errors_set(state, opts->skip_errors);
|
||||
pv_state_stop_at_size_set(state, opts->stop_at_size);
|
||||
pv_state_sync_after_write_set(state, opts->sync_after_write);
|
||||
|
||||
+2
-2
@@ -422,7 +422,7 @@ opts_t opts_parse(unsigned int argc, char **argv)
|
||||
opts->linemode = true;
|
||||
break;
|
||||
case '0':
|
||||
opts->null = true;
|
||||
opts->null_terminated_lines = true;
|
||||
opts->linemode = true;
|
||||
break;
|
||||
case 'i':
|
||||
@@ -529,7 +529,7 @@ opts_t opts_parse(unsigned int argc, char **argv)
|
||||
return NULL;
|
||||
|
||||
if (0 != opts->watch_pid) {
|
||||
if (opts->linemode || opts->null || opts->stop_at_size
|
||||
if (opts->linemode || opts->null_terminated_lines || opts->stop_at_size
|
||||
|| (opts->skip_errors > 0) || (opts->buffer_size > 0)
|
||||
|| (opts->rate_limit > 0)) {
|
||||
/*@-mustfreefresh@ *//* see above */
|
||||
|
||||
Reference in New Issue
Block a user