diff options
Diffstat (limited to 'libpiano')
| -rw-r--r-- | libpiano/.gitignore | 1 | ||||
| -rw-r--r-- | libpiano/ChangeLog | 0 | ||||
| -rw-r--r-- | libpiano/Makefile.am | 1 | ||||
| -rw-r--r-- | libpiano/NEWS | 0 | ||||
| -rw-r--r-- | libpiano/configure.in | 35 | ||||
| -rw-r--r-- | libpiano/src/Makefile.am | 7 | ||||
| -rw-r--r-- | libpiano/src/main.c | 6 |
7 files changed, 3 insertions, 47 deletions
diff --git a/libpiano/.gitignore b/libpiano/.gitignore deleted file mode 100644 index 2b29f27..0000000 --- a/libpiano/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tests diff --git a/libpiano/ChangeLog b/libpiano/ChangeLog deleted file mode 100644 index e69de29..0000000 --- a/libpiano/ChangeLog +++ /dev/null diff --git a/libpiano/Makefile.am b/libpiano/Makefile.am deleted file mode 100644 index af437a6..0000000 --- a/libpiano/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = src diff --git a/libpiano/NEWS b/libpiano/NEWS deleted file mode 100644 index e69de29..0000000 --- a/libpiano/NEWS +++ /dev/null diff --git a/libpiano/configure.in b/libpiano/configure.in deleted file mode 100644 index 0088343..0000000 --- a/libpiano/configure.in +++ /dev/null @@ -1,35 +0,0 @@ -# init -AC_INIT([libpiano], [0.1], [PromyLOPh@lavabit.com]) -AC_CONFIG_AUX_DIR([.]) -AC_CONFIG_SRCDIR([src/main.c]) -AM_CONFIG_HEADER([src/config.h]) -AM_INIT_AUTOMAKE([-Wall]) - -# progs -AC_PROG_CC -AM_PROG_CC_C_O -AM_SANITY_CHECK -AM_PROG_LIBTOOL - -PKG_PROG_PKG_CONFIG - -# libs -PKG_CHECK_MODULES(LIBCURL, libcurl >= 7.18.0) -AC_SUBST(LIBCURL_CFLAGS) -AC_SUBST(LIBCURL_LIBS) - -PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6.31) -AC_SUBST(LIBXML_CFLAGS) -AC_SUBST(LIBXML_LIBS) - -# headers -AC_CHECK_HEADERS([stdlib.h string.h]) - -# libc functions -AC_FUNC_REALLOC -AC_CHECK_FUNCS([memset strchr strdup]) - -# output -AC_CONFIG_FILES(Makefile src/Makefile) - -AC_OUTPUT diff --git a/libpiano/src/Makefile.am b/libpiano/src/Makefile.am deleted file mode 100644 index 7b7402d..0000000 --- a/libpiano/src/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -lib_LTLIBRARIES = libpiano.la - -libpiano_la_SOURCES = crypt.c http.c main.c xml.c crypt.h crypt_key_input.h \ - crypt_key_output.h http.h main.h xml.h -include_HEADERS = piano.h -libpiano_la_CPPFLAGS = ${LIBCURL_CFLAGS} ${LIBXML_CFLAGS} -libpiano_la_LIBADD = ${LIBCURL_LIBS} ${LIBXML_LIBS} diff --git a/libpiano/src/main.c b/libpiano/src/main.c index 600c74c..87b2d2b 100644 --- a/libpiano/src/main.c +++ b/libpiano/src/main.c @@ -73,7 +73,7 @@ void PianoInit (PianoHandle_t *ph) { memset (ph, 0, sizeof (*ph)); ph->curlHandle = curl_easy_init (); snprintf (ph->routeId, sizeof (ph->routeId), "%07liP", time (NULL) % 10000000); - curl_easy_setopt (ph->curlHandle, CURLOPT_USERAGENT, PACKAGE_STRING); + curl_easy_setopt (ph->curlHandle, CURLOPT_USERAGENT, PACKAGE); curl_easy_setopt (ph->curlHandle, CURLOPT_CONNECTTIMEOUT, 60); curl_easy_setopt (ph->curlHandle, CURLOPT_TIMEOUT, 60); } @@ -200,7 +200,7 @@ PianoReturn_t PianoConnect (PianoHandle_t *ph, const char *user, PianoReturn_t ret; #if 0 - printf ("\n==========\n" PACKAGE_NAME ": Pandora changed their blowfish " + printf ("\n==========\n" PACKAGE ": Pandora changed their blowfish " "encryption key. You will not be able to connect to pandora.\n" "==========\n"); #endif @@ -865,7 +865,7 @@ const char *PianoErrorToStr (PianoReturn_t ret) { break; case PIANO_RET_PROTOCOL_INCOMPATIBLE: - return "Protocol incompatible. Please upgrade " PACKAGE_NAME "."; + return "Protocol incompatible. Please upgrade " PACKAGE "."; break; case PIANO_RET_READONLY_MODE: |