From 3fd1247a32cbf4daecabbccd45cb2a91722d6b44 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 13 May 2013 04:59:13 +0000 Subject: [PATCH] Move gcd_n_uint to osscan2.cc. --- osscan2.cc | 22 ++++++++++++++++++++++ utils.cc | 22 ---------------------- utils.h | 2 -- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/osscan2.cc b/osscan2.cc index 38edc392a..9f800836b 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -2175,6 +2175,28 @@ bool ScanStats::sendOK() { * Implementation of class HostOsScan * ******************************************************************************/ +static unsigned int gcd_n_uint(int nvals, unsigned int *val) { + unsigned int a, b, c; + + if (!nvals) + return 1; + a = *val; + for (nvals--; nvals; nvals--) { + b = *++val; + if (a < b) { + c = a; + a = b; + b = c; + } + while (b) { + c = a % b; + a = b; + b = c; + } + } + return a; +} + void HostOsScan::makeTSeqFP(HostOsScanStats *hss) { int i, j; u32 seq_diffs[NUM_SEQ_SAMPLES]; diff --git a/utils.cc b/utils.cc index c49748fe2..8757b6d76 100644 --- a/utils.cc +++ b/utils.cc @@ -267,28 +267,6 @@ int Send(int sd, const void *msg, size_t len, int flags) { return (res < 0) ? -1 : (int) len; } -unsigned int gcd_n_uint(int nvals, unsigned int *val) { - unsigned int a, b, c; - - if (!nvals) - return 1; - a = *val; - for (nvals--; nvals; nvals--) { - b = *++val; - if (a < b) { - c = a; - a = b; - b = c; - } - while (b) { - c = a % b; - a = b; - b = c; - } - } - return a; -} - /* This function takes a command and the address of an uninitialized char **. It parses the command (by separating out whitespace) into an argv[]-style char **, which it sets the argv parameter to. The function returns the number diff --git a/utils.h b/utils.h index 2d1406751..9a843e433 100644 --- a/utils.h +++ b/utils.h @@ -175,8 +175,6 @@ char *chomp(char *string); int Send(int sd, const void *msg, size_t len, int flags); -unsigned int gcd_n_uint(int nvals, unsigned int *val); - int arg_parse(const char *command, char ***argv); void arg_parse_free(char **argv);