projects
/
sort-networks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/sn_network.h: Print "NULL" in a monospace font.
[sort-networks.git]
/
src
/
sn-batcher.c
diff --git
a/src/sn-batcher.c
b/src/sn-batcher.c
index
ed22863
..
13f6d8e
100644
(file)
--- a/
src/sn-batcher.c
+++ b/
src/sn-batcher.c
@@
-1,6
+1,6
@@
/**
/**
- *
collectd
- src/sn-batcher.c
- * Copyright (C) 2008
,2009
Florian octo Forster
+ *
libsortnetwork
- src/sn-batcher.c
+ * Copyright (C) 2008
-2010
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-16,7
+16,7
@@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <
octo at verplant.org
>
+ * Florian octo Forster <
ff at octo.it
>
**/
#ifndef _ISOC99_SOURCE
**/
#ifndef _ISOC99_SOURCE
@@
-75,11
+75,11
@@
static sn_network_t *create_batcher_sort (size_t inputs_num)
if (n_small == NULL)
return (NULL);
if (n_small == NULL)
return (NULL);
- n = sn_network_combine_bitonic (n_small, n_small);
+ n = sn_network_combine_bitonic
_merge
(n_small, n_small);
if (n == NULL)
{
sn_network_destroy (n_small);
if (n == NULL)
{
sn_network_destroy (n_small);
- fprintf (stderr, "create_batcher_sort: sn_network_combine_bitonic "
+ fprintf (stderr, "create_batcher_sort: sn_network_combine_bitonic
_merge
"
"failed.\n");
return (NULL);
}
"failed.\n");
return (NULL);
}