MonetDB: string_imprints - Improve names

[Panagiotis Koutsourakis]

Changeset: 950d5acff27f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=950d5acff27f
Modified Files:
        gdk/gdk_strimps.c
        gdk/gdk_strimps.h
        monetdb5/modules/mal/batExtensions.c
Branch: string_imprints
Log Message:

Improve names


diffs (53 lines):

diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -91,7 +91,7 @@ GDKstrimp_ndigrams(BAT *b, size_t *n)
  * count.
  */
 gdk_return
-GDKstrimp_makehistogram(BAT *b, uint64_t *hist, size_t hist_size, size_t 
*count)
+GDKstrimp_make_histogram(BAT *b, uint64_t *hist, size_t hist_size, size_t 
*nbins)
 {
        lng t0=0;
        size_t hi;
@@ -106,7 +106,7 @@ GDKstrimp_makehistogram(BAT *b, uint64_t
                hist[hi] = 0;
 
        bi = bat_iterator(b);
-       *count = 0;
+       *nbins = 0;
        for(i = 0; i < b->batCount; i++) {
                s = (char *)BUNtvar(bi, i);
                if (!strNil(s)) {
@@ -129,7 +129,7 @@ GDKstrimp_makehistogram(BAT *b, uint64_t
                                        hi = pairToIndex(*(ptr), *(ptr+1));
                                        assert(hi < hist_size);
                                        if (hist[hi] == 0)
-                                               (*count)++;
+                                               (*nbins)++;
                                        hist[hi]++;
                                }
                        }
diff --git a/gdk/gdk_strimps.h b/gdk/gdk_strimps.h
--- a/gdk/gdk_strimps.h
+++ b/gdk/gdk_strimps.h
@@ -17,6 +17,6 @@
 #define STRIMP_HISTSIZE 256*256
 
 gdk_export gdk_return GDKstrimp_ndigrams(BAT *b, size_t *n);
-gdk_export gdk_return GDKstrimp_makehistogram(BAT *b, uint64_t *hist, size_t 
hist_size, size_t *count);
 
+gdk_export gdk_return GDKstrimp_make_histogram(BAT *b, uint64_t *hist, size_t 
hist_size, size_t *nbins);
 #endif /* _GDK_STRIMPS_H_ */
diff --git a/monetdb5/modules/mal/batExtensions.c 
b/monetdb5/modules/mal/batExtensions.c
--- a/monetdb5/modules/mal/batExtensions.c
+++ b/monetdb5/modules/mal/batExtensions.c
@@ -380,7 +380,7 @@ CMDstrimp_makehist(Client cntxt, MalBlkP
        if ((b = BATdescriptor(bid)) == NULL)
                throw(MAL, "bat.strimpHistogram", SQLSTATE(HY002) 
RUNTIME_OBJECT_MISSING);
 
-       if (!GDKstrimp_makehistogram(b, hist, STRIMP_HISTSIZE, &count)) {
+       if (!GDKstrimp_make_histogram(b, hist, STRIMP_HISTSIZE, &count)) {
                throw(MAL, "bat.strimpHistogram", SQLSTATE(HY002) 
OPERATION_FAILED);
        }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list