Much simpler faster code for parsing fastq files.

[fastq-tools.git] / src / fastq-kmers.c

diff --git a/src/fastq-kmers.c b/src/fastq-kmers.c
index d78a453b58d75757910012c4ab669f38afe209f0..92f4314141133c14bd0e4dc8c7a6507fb76daf53 100644 (file)
--- a/src/fastq-kmers.c
+++ b/src/fastq-kmers.c
@@ -9,8 +9,8 @@
  *
  */
 
-#include "fastq-common.h"
-#include "fastq-parse.h"
+#include "common.h"
+#include "parse.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -27,6 +27,7 @@
 #  define SET_BINARY_MODE(file)
 #endif
 
+static const char* prog_name = "fastq-kmers";
 
 void print_help()
 {
@@ -35,12 +36,12 @@ void print_help()
 "Print kmer counts for the given kmer size.\n"
 "Output is in two tab-seperated columns for kmer and frequency.\n\n"
 "Options:\n"
+"  -k NUM, --size=NUM      kmer size (default: 1)\n"
 "  -h, --help              print this message\n"
-"  -k, --size              kmer size (default: 1)\n"
+"  -V, --version           output version information and exit\n"
     );
 }
 
-static int help_flag;
 static int k;
 
 int packkmer( const char* s, uint32_t* kmer, int k )
@@ -108,13 +109,13 @@ void unpackkmer( uint32_t kmer, char* s, int k )
 
 void count_fastq_kmers(FILE* fin, uint32_t* cs)
 {
-    seq_t* seq = fastq_alloc_seq();
-    fastq_t* fqf = fastq_open(fin);
+    seq_t* seq = seq_create();
+    fastq_t* fqf = fastq_create(fin);
     int i;
     int n;
     uint32_t kmer;
 
-    while (fastq_next(fqf, seq)) {
+    while (fastq_read(fqf, seq)) {
         n = (int)seq->seq.n - k + 1;
         for (i = 0; i < n; i++) {
             if( packkmer(seq->seq.s + i, &kmer, k) ) {
@@ -123,8 +124,8 @@ void count_fastq_kmers(FILE* fin, uint32_t* cs)
         }
     }
 
-    fastq_free_seq(seq);
-    fastq_close(fqf);
+    seq_free(seq);
+    fastq_free(fqf);
 }
 
 
@@ -150,7 +151,6 @@ int main(int argc, char* argv[])
     SET_BINARY_MODE(stdin);
     SET_BINARY_MODE(stdout);
 
-    help_flag = 0;
     k = 1;
 
     uint32_t n;   /* number of kmers: 4^k */
@@ -162,13 +162,14 @@ int main(int argc, char* argv[])
     int opt_idx;
     static struct option long_options[] =
         { 
-          {"help", no_argument, &help_flag, 1},
-          {"size", no_argument, 0, 0},
+          {"size", no_argument,    0, 0},
+          {"help", no_argument,    0, 'h'},
+          {"version", no_argument, 0, 'V'},
           {0, 0, 0, 0}
         };
 
     while (1) {
-        opt = getopt_long(argc, argv, "hk:", long_options, &opt_idx);
+        opt = getopt_long(argc, argv, "k:hV", long_options, &opt_idx);
 
         if( opt == -1 ) break;
 
@@ -182,14 +183,18 @@ int main(int argc, char* argv[])
                 }
                 break;
 
-            case 'h':
-                help_flag = 1;
-                break;
-
             case 'k':
                 k = atoi(optarg);
                 break;
 
+            case 'h':
+                print_help();
+                return 0;
+
+            case 'V':
+                print_version(stdout, prog_name);
+                return 0;
+
             case '?':
                 return 1;
 
@@ -198,11 +203,6 @@ int main(int argc, char* argv[])
         }
     }
 
-    if (help_flag) {
-        print_help();
-        return 0;
-    }
-
     if (k < 1) {
         fprintf(stderr, "Kmer size must be at least 1.");
         return 1;