From: Alexey I. Froloff <raorn@raorn.name>
Date: Wed, 24 Oct 2012 17:10:15 +0000 (+0400)
Subject: [PR-172] Fix compilatioin issues on OpenWRT
X-Git-Tag: v3.5~299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1334869bf0ea668e58e1c72daa3c09c1a95b5d81;p=thirdparty%2Ftvheadend.git

[PR-172] Fix compilatioin issues on OpenWRT

Fix SHA1_* function names
Fix unused variables and functions
---

diff --git a/src/trap.c b/src/trap.c
index bd7611861..b0fe543be 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -67,6 +67,7 @@ sappend(char *buf, size_t l, const char *fmt, ...)
 /**
  *
  */
+#if ENABLE_EXECINFO
 static int
 add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
 {
@@ -126,6 +127,7 @@ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
   close(fd[0]);
   return 0;
 }
+#endif /* ENABLE_EXECINFO */
 
 
 
@@ -133,8 +135,8 @@ static void
 traphandler(int sig, siginfo_t *si, void *UC)
 {
   ucontext_t *uc = UC;
-  char buf[200];
 #if ENABLE_EXECINFO
+  char buf[200];
   static void *frames[MAXFRAMES];
   int nframes = backtrace(frames, MAXFRAMES);
   Dl_info dli;
@@ -243,9 +245,9 @@ trap_init(const char *ver)
       char *m = malloc(st.st_size);
       if(m != NULL) {
 	if(read(fd, m, st.st_size) == st.st_size) {
-	  SHA_Init(&binsum);
-	  SHA_Update(&binsum, (void *)m, st.st_size);
-	  SHA_Final(digest, &binsum);
+	  SHA1_Init(&binsum);
+	  SHA1_Update(&binsum, (void *)m, st.st_size);
+	  SHA1_Final(digest, &binsum);
 	}
 	free(m);
       }