preparation for release

ChangeLog

@@ -1,8 +1,8 @@
 Revision history for C and Perl extension of nfdump.
 
-1.18 2016-01-xx
+1.18 2016-01-29
 	-perl: new variables $flow->{NUM_OF_FIELDS} and $flow->{NAME} can be accesed 
-	       to get returned number and names if fields (thanks to Alexander
+/bin/bash: q: command not found
 	       Zangerl, Report #110170)
 	-c: adjusted to nfdump-1.6.14
 	-c: two new lnf_open flags LNF_COMP_LZO and LNF_COMP_BZ2
@@ -14,7 +14,7 @@ Revision history for C and Perl extension of nfdump.
 	    Hutak)
 	-c: fixed size of some fields (patch submitted by Lukas Hutak)
 	-c: API change - tha value of LNF_AGGR_KEY is 0x0008
-	-c: API change - new LNF_AGGR_AUTO for autodetection aggregation mode
+	-c: API change - new LNF_AGGR_AUTO for autodetection of aggregation mode
 	-nfdumpp: new -w and -o options 
 	-nfdumpp: new modular output system 
 	-nfdumpp: invalid dispaly of duration field 

bin/Makefile.am

@@ -1,7 +1,7 @@
 
 AM_CFLAGS = -I$(top_srcdir)/include 
 
-EXTRA_DIST = cpucores.h flist.h screen.h progress.h output_line.h output_nfdump.h
+EXTRA_DIST = cpucores.h flist.h output.h progress.h output_line.h output_nfdump.h 
 
 if LNF_THREADS
 bin_PROGRAMS = nfdumpp

bin/nfdumpp.c

@@ -57,6 +57,7 @@ int process_file(char *filename, lnf_filter_t *filterp) {
 	int i = 0;
 	int tid;
 	int match;
+	int o;
 
 	tid = (int)pthread_self();
 
@@ -80,7 +81,7 @@ int process_file(char *filename, lnf_filter_t *filterp) {
 
 		/* add to memory heap */
 		if ( match ) {
-			for (int o = 0; o < numoutputs; o++) {
+			for (o = 0; o < numoutputs; o++) {
 				output_write(&output[o], recp);
 			}
 		}
@@ -102,6 +103,7 @@ void *process_thread(void *p) {
 	int rows;
 	int tid;
 	char filename[PATH_MAX];
+	int o;
 
 	tid = (int)pthread_self();
 
@@ -129,7 +131,7 @@ void *process_thread(void *p) {
 
 DONE:
 
-	for (int o = 0; o < numoutputs; o++) {
+	for (o = 0; o < numoutputs; o++) {
 		output_merge_threads(&output[o]);
 	}
 
@@ -146,7 +148,7 @@ int main(int argc, char **argv) {
 	int sortfield = 0;
 	int sortbits4 = 0;
 	int sortbits6 = 0;
-	int c;
+	int c, o;
 	int numaflags = 0;
 	output_t *outputp;
 //	lnf_filter_t *filterp;
@@ -164,7 +166,7 @@ int main(int argc, char **argv) {
 	filter[0] = '\0';
 
 	/* fields in all outpusts  - initalised in all outputs */
-	for (int i = 0; i < MAX_OUTPUTS; i++) {
+	for (i = 0; i < MAX_OUTPUTS; i++) {
 		output_init(&output[i]);
 		output_set_fmt(&output[i], OFMT_LINE, NULL);			
 		output_field_add(&output[i], LNF_FLD_FIRST);
@@ -298,22 +300,22 @@ int main(int argc, char **argv) {
 	/*  prepare and run threads */
 	pthread_mutex_init(&mutex, NULL);
 
-	for ( i = 0 ; i < numthreads ; i++ ) {
+	for (i = 0 ; i < numthreads ; i++ ) {
 		if ( pthread_create(&th[i], NULL, process_thread, NULL) < 0) {
 			fprintf(stderr, "Can not create thread for %d\n", i);
 			break;
 		}
 	}
 
 	/* wait for threads */
-	for ( i = 0; i < numthreads; i++ ) {
+	for (i = 0; i < numthreads; i++ ) {
 		if( pthread_join(th[i], NULL) ) {
 			fprintf(stderr, "Error joining thread\n");
 			break;
 		}
 	}
 
-	for (int o = 0; o < numoutputs; o++) {
+	for (o = 0; o < numoutputs; o++) {
 		if (o > 0 ) { 
 			output_start(&output[o]);
 		}

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(libnf, 1.17, tpoder@cis.vutbr.cz)
+AC_INIT(libnf, 1.18, tpoder@cis.vutbr.cz)
 
 AC_DEFINE(NFDUMP_VERSION,["nfdump, 1.6.13, phaag@users.sourceforge.net"],[nfdump])
 # $Date: 2014-11-16 14:10:20 +0100 (Sun, 16 Nov 2014) $
@@ -218,7 +218,7 @@ if test "$ac_cv_struct_semun" = "yes"; then
 fi
 
 
-AC_OUTPUT(Makefile libnf.spec include/Makefile src/Makefile bin/Makefile examples/Makefile)
+AC_OUTPUT(Makefile libnf.spec libnf.doxygen include/Makefile src/Makefile bin/Makefile examples/Makefile)
 
 if test "${enable_threads}" = "no" ; then
 echo ""

libnf.doxygen → libnf.doxygen.in

@@ -31,7 +31,7 @@ PROJECT_NAME           = libnf
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.16
+PROJECT_NUMBER         = @VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

prepare-nfdump.sh

@@ -21,7 +21,7 @@
 #
 
 
-LIBNF_VERSION="1.10"
+LIBNF_VERSION="1.18"
 
 NFDUMP_VERSION="1.6.14"
 NFDUMP="nfdump-$NFDUMP_VERSION"