From 365c3004398b61377c5b3b03ae267f467eea80e4 Mon Sep 17 00:00:00 2001 From: Bernhard Schmidt Date: Mon, 3 Oct 2016 20:04:53 +0200 Subject: [PATCH] Fix spelling errors in sources found by Debian lintian --- bin/grammar.y | 4 ++-- bin/grammar.y.mine | 2 +- bin/ipfix.c | 2 +- bin/launch.c | 6 +++--- bin/netflow_v9.c | 2 +- bin/nfanon.c | 2 +- bin/nfcapd.c | 4 ++-- bin/nfdump.c | 6 +++--- bin/nfexpire.c | 2 +- bin/nfexport.c | 2 +- bin/sfcapd.c | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/grammar.y b/bin/grammar.y index 933465e..39a483d 100755 --- a/bin/grammar.y +++ b/bin/grammar.y @@ -822,7 +822,7 @@ term: ANY { /* this is an unconditionally true expression, as a filter applies i if ( $5 > (bytes*8) ) { - yyerror("Too many netbits for this IP addresss"); + yyerror("Too many netbits for this IP address"); YYABORT; } @@ -1413,7 +1413,7 @@ term: ANY { /* this is an unconditionally true expression, as a filter applies i if ( $5 > (bytes*8) ) { - yyerror("Too many netbits for this IP addresss"); + yyerror("Too many netbits for this IP address"); YYABORT; } diff --git a/bin/grammar.y.mine b/bin/grammar.y.mine index 2da1a3c..c99c2ff 100755 --- a/bin/grammar.y.mine +++ b/bin/grammar.y.mine @@ -944,7 +944,7 @@ term: ANY { /* this is an unconditionally true expression, as a filter applies i if ( $5 > (bytes*8) ) { - yyerror("Too many netbits for this IP addresss"); + yyerror("Too many netbits for this IP address"); YYABORT; } diff --git a/bin/ipfix.c b/bin/ipfix.c index f998b72..6ccacad 100644 --- a/bin/ipfix.c +++ b/bin/ipfix.c @@ -666,7 +666,7 @@ size_t size_required; // skip exporter_sysid and reserved offset += 4; - /* IP addresss record + /* IP address record * This record is expected in the output stream. If not available * in the template, assume empty v4 address. */ diff --git a/bin/launch.c b/bin/launch.c index 4475c7e..b1640a7 100644 --- a/bin/launch.c +++ b/bin/launch.c @@ -412,18 +412,18 @@ srecord_t *InfoRecord; } } if ( child_exit ) { - syslog(LOG_INFO, "laucher child exit %d childs.", child_exit); + syslog(LOG_INFO, "launcher child exit %d children.", child_exit); while ( (pid = waitpid (-1, &stat, WNOHANG)) > 0 ) { if ( WIFEXITED(stat) ) { syslog(LOG_DEBUG, "launcher child %i exit status: %i", pid, WEXITSTATUS(stat)); } if ( WIFSIGNALED(stat) ) { - syslog(LOG_WARNING, "laucher child %i died due to signal %i", pid, WTERMSIG(stat)); + syslog(LOG_WARNING, "launcher child %i died due to signal %i", pid, WTERMSIG(stat)); } child_exit--; } - syslog(LOG_INFO, "laucher waiting childs done. %d childs", child_exit); + syslog(LOG_INFO, "launcher waiting children done. %d children", child_exit); child_exit = 0; } if ( done ) { diff --git a/bin/netflow_v9.c b/bin/netflow_v9.c index fd80124..7fefbe5 100644 --- a/bin/netflow_v9.c +++ b/bin/netflow_v9.c @@ -755,7 +755,7 @@ size_t size_required; // skip exporter_sysid and reserved offset += 4; - /* IP addresss record + /* IP address record * This record is expected in the output stream. If not available * in the template, assume empty v4 address. */ diff --git a/bin/nfanon.c b/bin/nfanon.c index bd21ed4..98debab 100755 --- a/bin/nfanon.c +++ b/bin/nfanon.c @@ -90,7 +90,7 @@ static void process_data(void *wfile); static void usage(char *name) { printf("usage %s [options] \n" "-h\t\tthis text you see right here\n" - "-K \tAnonymize IP addressses using CryptoPAn with key .\n" + "-K \tAnonymize IP addresses using CryptoPAn with key .\n" "-r\t\tread input from file\n" "-M \tRead input from multiple directories.\n" "-R \tRead input from sequence of files.\n" diff --git a/bin/nfcapd.c b/bin/nfcapd.c index c99227c..eff7f6f 100644 --- a/bin/nfcapd.c +++ b/bin/nfcapd.c @@ -203,7 +203,7 @@ pid_t ret; sleep(1); } if ( i >= LAUNCHER_TIMEOUT ) { - LogError("Laucher does not want to terminate - signal again"); + LogError("Launcher does not want to terminate - signal again"); kill(pid, SIGTERM); sleep(1); } @@ -708,7 +708,7 @@ srecord_t *commbuff; if ( verbose ) { uint16_t count = ntohs(nf_header->count); if ( blast_cnt != count ) { - // LogError("Missmatch blast check: Expected %u got %u\n", blast_cnt, count); + // LogError("Mismatch blast check: Expected %u got %u\n", blast_cnt, count); blast_cnt = count; blast_failures++; } else { diff --git a/bin/nfdump.c b/bin/nfdump.c index ba8d92f..b8383bb 100644 --- a/bin/nfdump.c +++ b/bin/nfdump.c @@ -297,7 +297,7 @@ static void usage(char *name) { "-M \tRead input from multiple directories.\n" "\t\t/dir/dir1:dir2:dir3 Read the same files from '/dir/dir1' '/dir/dir2' and '/dir/dir3'.\n" "\t\trequests either -r filename or -R firstfile:lastfile without pathnames\n" - "-m\t\tdepricated\n" + "-m\t\tdeprecated\n" "-O Sort order for aggregated flows - tstart, tend, flows, packets bps pps bbp etc.\n" "-R \tRead input from sequence of files.\n" "\t\t/any/dir Read all files in that directory.\n" @@ -897,7 +897,7 @@ char Ident[IDENTLEN]; print_order = "tstart"; Parse_PrintOrder(print_order); date_sorted = 1; - LogError("Option -m depricated. Use '-O tstart' instead\n"); + LogError("Option -m deprecated. Use '-O tstart' instead\n"); break; case 'M': Mdirs = optarg; @@ -1009,7 +1009,7 @@ char Ident[IDENTLEN]; } if ( rfile && Rfile ) { - LogError("-r and -R are mutually exclusive. Plase specify either -r or -R\n"); + LogError("-r and -R are mutually exclusive. Please specify either -r or -R\n"); exit(255); } if ( Mdirs && !(rfile || Rfile) ) { diff --git a/bin/nfexpire.c b/bin/nfexpire.c index 8d95c6b..7fe7e87 100644 --- a/bin/nfexpire.c +++ b/bin/nfexpire.c @@ -376,7 +376,7 @@ channel_t *channel, *current_channel; printf("Rescan again, due to file changes in directory!\n"); } if ( BookSequence(current_channel->books) != last_sequence ) { - fprintf(stderr, "Could not savely rescan the directory. Data is not consistent.\n"); + fprintf(stderr, "Could not safely rescan the directory. Data is not consistent.\n"); ReleaseBookkeeper(current_channel->books, DETACH_ONLY); if ( current_channel->status == OK ) WriteStatInfo(current_channel->dirstat); diff --git a/bin/nfexport.c b/bin/nfexport.c index be62a5e..279ad88 100755 --- a/bin/nfexport.c +++ b/bin/nfexport.c @@ -295,7 +295,7 @@ char *string; } if ( c != maxindex ) { - LogError("Abort: Missmatch %s line %d: %s\n", __FILE__, __LINE__, strerror (errno)); + LogError("Abort: Mismatch %s line %d: %s\n", __FILE__, __LINE__, strerror (errno)); return 0; } diff --git a/bin/sfcapd.c b/bin/sfcapd.c index 718d22e..99e9b07 100644 --- a/bin/sfcapd.c +++ b/bin/sfcapd.c @@ -178,7 +178,7 @@ pid_t ret; sleep(1); } if ( i >= LAUNCHER_TIMEOUT ) { - syslog(LOG_WARNING, "Laucher does not want to terminate - signal again"); + syslog(LOG_WARNING, "Launcher does not want to terminate - signal again"); kill(pid, SIGTERM); sleep(1); }