From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 14 Aug 2015 02:14:14 +0000 (-0400)
Subject: Fix some types on container fns
X-Git-Tag: tor-0.2.7.3-rc~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=216bde38e0cb281ca919a1429da0e542fad67612;p=thirdparty%2Ftor.git

Fix some types on container fns
---

diff --git a/src/common/container.c b/src/common/container.c
index 082afb51ee..636dfb6c57 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -742,7 +742,7 @@ smartlist_sort_strings(smartlist_t *sl)
 }
 
 /** Return the most frequent string in the sorted list <b>sl</b> */
-char *
+const char *
 smartlist_get_most_frequent_string(smartlist_t *sl)
 {
   return smartlist_get_most_frequent(sl, compare_string_ptrs_);
@@ -752,7 +752,7 @@ smartlist_get_most_frequent_string(smartlist_t *sl)
  * If <b>count_out</b> is provided, set <b>count_out</b> to the
  * number of times that string appears.
  */
-char *
+const char *
 smartlist_get_most_frequent_string_(smartlist_t *sl, int *count_out)
 {
   return smartlist_get_most_frequent_(sl, compare_string_ptrs_, count_out);
@@ -1020,7 +1020,7 @@ smartlist_sort_digests256(smartlist_t *sl)
 
 /** Return the most frequent member of the sorted list of DIGEST256_LEN
  * digests in <b>sl</b> */
-char *
+const uint8_t *
 smartlist_get_most_frequent_digest256(smartlist_t *sl)
 {
   return smartlist_get_most_frequent(sl, compare_digests256_);
diff --git a/src/common/container.h b/src/common/container.h
index 2a6ba01e62..5abd8b48d9 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -109,9 +109,9 @@ void smartlist_sort_digests(smartlist_t *sl);
 void smartlist_sort_digests256(smartlist_t *sl);
 void smartlist_sort_pointers(smartlist_t *sl);
 
-char *smartlist_get_most_frequent_string(smartlist_t *sl);
-char *smartlist_get_most_frequent_string_(smartlist_t *sl, int *count_out);
-char *smartlist_get_most_frequent_digest256(smartlist_t *sl);
+const char *smartlist_get_most_frequent_string(smartlist_t *sl);
+const char *smartlist_get_most_frequent_string_(smartlist_t *sl, int *count_out);
+const uint8_t *smartlist_get_most_frequent_digest256(smartlist_t *sl);
 
 void smartlist_uniq_strings(smartlist_t *sl);
 void smartlist_uniq_digests(smartlist_t *sl);
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 0f3b77fe28..d8e6ee2229 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -478,7 +478,7 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method,
 
   if (microdesc_digest256_out) {
     smartlist_t *digests = smartlist_new();
-    const char *best_microdesc_digest;
+    const uint8_t *best_microdesc_digest;
     SMARTLIST_FOREACH_BEGIN(votes, vote_routerstatus_t *, rs) {
         char d[DIGEST256_LEN];
         if (compare_vote_rs(rs, most))