libattachsql · libla · Sep 28, 2015 · Sep 28, 2015 · Sep 28, 2015 · Sep 30, 2015
diff --git a/.ci/clang-3.4.sh b/.ci/clang-3.4.sh
@@ -1,7 +1,9 @@
-sudo apt-get install -y libuv-dev zlib1g-dev clang-3.4 libssl-dev
+sudo apt-get install -y zlib1g-dev clang-3.4 libssl-dev
 
 CC="clang"
 CXX="clang++"
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
+make
 make check 2>/dev/null
diff --git a/.ci/clang-ia32.sh b/.ci/clang-ia32.sh
@@ -1,4 +1,4 @@
-sudo apt-get install -y libc6-dev libc6-dev:i386 libuv-dev:i386 zlib1g-dev:i386 build-essential g++ gcc libtool libssl-dev:i386
+sudo apt-get install -y libc6-dev libc6-dev:i386 zlib1g-dev:i386 build-essential g++ gcc libtool libssl-dev:i386
 
 sudo apt-get install -y gcc-multilib g++-multilib clang
 
@@ -8,6 +8,8 @@ export CFLAGS="-m32"
 export CXXFLAGS="-m32"
 export CPPFLAGS="-m32"
 export LDFLAGS="-m32"
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
+make
 make check 2>/dev/null
diff --git a/.ci/clang.sh b/.ci/clang.sh
@@ -1,7 +1,9 @@
-sudo apt-get install -y libuv-dev zlib1g-dev clang libssl-dev
+sudo apt-get install -y zlib1g-dev clang libssl-dev
 
 CC="clang"
 CXX="clang++"
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
+make
 make check 2>/dev/null
diff --git a/.ci/cppcheck.sh b/.ci/cppcheck.sh
@@ -1,5 +1,6 @@
-sudo apt-get install -y cppcheck libuv-dev
+sudo apt-get install -y cppcheck
 
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
 cppcheck --quiet --enable=all --error-exitcode=1 src tests examples
diff --git a/.ci/docs.sh b/.ci/docs.sh
@@ -1,5 +1,6 @@
-sudo apt-get install -y python-sphinx libuv-dev
+sudo apt-get install -y python-sphinx
 
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure
 make html
diff --git a/.ci/gcc-distcheck.sh b/.ci/gcc-distcheck.sh
@@ -1,5 +1,6 @@
-sudo apt-get install -y libuv-dev zlib1g-dev libssl-dev
+sudo apt-get install -y zlib1g-dev libssl-dev
 
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
 make distcheck 2>/dev/null
diff --git a/.ci/gcc-ia32.sh b/.ci/gcc-ia32.sh
@@ -1,11 +1,13 @@
-sudo apt-get install -y libc6-dev libc6-dev:i386 libuv-dev:i386 zlib1g-dev:i386 build-essential g++ gcc libtool libssl-dev:i386
+sudo apt-get install -y libc6-dev libc6-dev:i386 zlib1g-dev:i386 build-essential g++ gcc libtool libssl-dev:i386
 
 sudo apt-get install -y gcc-multilib g++-multilib
 
 export CFLAGS="-m32"
 export CXXFLAGS="-m32"
 export LDFLAGS="-m32"
 export CPPFLAGS="-m32"
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
+make
 make check 2>/dev/null
diff --git a/.ci/install-libuv.sh b/.ci/install-libuv.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+mkdir ~/tmp
+cd ~/tmp
+wget https://github.com/libuv/libuv/archive/v1.4.2.tar.gz
+tar -zxvf v1.4.2.tar.gz
+cd libuv-1.4.2
+./autogen.sh
+./configure --prefix=/usr
+make
+sudo make install
diff --git a/.ci/no-optional.sh b/.ci/no-optional.sh
@@ -1,6 +1,7 @@
-sudo apt-get install -y libuv-dev
 sudo apt-get remove -y zlib1g-dev libssl-dev
 
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
+make
 make check 2>/dev/null
diff --git a/.ci/scanbuild.sh b/.ci/scanbuild.sh
@@ -1,7 +1,8 @@
-sudo apt-get install -y libuv-dev zlib1g-dev clang-3.4 libssl-dev
+sudo apt-get install -y zlib1g-dev clang-3.4 libssl-dev
 
 CC="clang"
 CXX="clang++"
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
 scan-build --use-cc=clang --use-c++=clang++ --status-bugs make
diff --git a/.ci/valgrind.sh b/.ci/valgrind.sh
@@ -1,5 +1,6 @@
-sudo apt-get install -y libuv-dev zlib1g-dev valgrind libssl-dev
+sudo apt-get install -y zlib1g-dev valgrind libssl-dev
 
+.ci/install-libuv.sh
 autoreconf -fi
 ./configure --enable-debug
 TESTS_ENVIRONMENT="./libtool --mode=execute valgrind --error-exitcode=1 --leak-check=yes --track-fds=no --malloc-fill=A5 --free-fill=DE --suppressions=valgrind.supp" make check 2>/dev/null
diff --git a/libattachsql-1.0/utility.h b/libattachsql-1.0/utility.h
@@ -36,6 +36,9 @@ uint8_t attachsql_get_library_version_patch(void);
 ASQL_API
 void attachsql_library_init(void);
 
+ASQL_API
+void attachsql_snprintf(char *buffer, size_t count, const char *format, ...);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/libattachsql-1.0/visibility.h b/libattachsql-1.0/visibility.h
@@ -14,21 +14,24 @@
  * under the License.
  *
  */
+#if defined(ASQL_DLL)
+# if defined(BUILDING_ASQL)
+#  if defined(_MSC_VER)
+#   define ASQL_API extern __declspec(dllexport)
+#  elif defined(HAVE_VISIBILITY) && HAVE_VISIBILITY
+#   define ASQL_API __attribute__ ((visibility("default")))
+#  elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#   define ASQL_API __global
+#  endif /* defined(HAVE_VISIBILITY) */
+# else  /* defined(BUILDING_ASQL) */
+#  if defined(_MSC_VER)
+#   define ASQL_API extern __declspec(dllimport)
+#  else
+#   define ASQL_API
+#  endif /* defined(_MSC_VER) */
+# endif /* defined(BUILDING_ASQL) */
+#endif /* defined(ASQL_DLL) */
 
-#if defined(BUILDING_ASQL)
-# if defined(HAVE_VISIBILITY) && HAVE_VISIBILITY
-#  define ASQL_API __attribute__ ((visibility("default")))
-# elif defined (__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-#  define ASQL_API __global
-# elif defined(_MSC_VER)
-#  define ASQL_API extern __declspec(dllexport)
-# else
-#  define ASQL_API
-# endif /* defined(HAVE_VISIBILITY) */
-#else  /* defined(BUILDING_ASQL) */
-# if defined(_MSC_VER)
-#  define ASQL_API extern __declspec(dllimport)
-# else
-#  define ASQL_API
-# endif /* defined(_MSC_VER) */
-#endif /* defined(BUILDING_ASQL) */
+#ifndef ASQL_API
+# define ASQL_API
+#endif
diff --git a/rpm/libattachsql.spec.in b/rpm/libattachsql.spec.in
@@ -4,8 +4,13 @@ Version: @VERSION@
 Release: 1
 License: Apache2
 Group: System Environment/Libraries
-BuildRequires: libuv-devel zlib-devel openssl-devel redhat-rpm-config
-Requires: libuv zlib openssl
+BuildRequires: libuv-devel >= 1.0
+BuildRequires: zlib-devel
+BuildRequires: openssl-devel
+BuildRequires: redhat-rpm-config
+Requires: libuv >= 1.0
+Requires: zlib
+Requires: openssl
 URL: https://libattachsql.org/
 
 Packager: Andrew Hutchings <andrew@linuxjedi.co.uk>

diff --git a/src/ascore/command.cc b/src/ascore/command.cc
@@ -110,11 +110,11 @@ ascore_command_status_t ascore_command_send(ascon_st *con, ascore_command_t comm
   if (ret != 0)
   {
     con->local_errcode= ASRET_NET_WRITE_ERROR;
-    asdebug("Write fail: %s", uv_err_name(uv_last_error(con->uv_objects.loop)));
+    asdebug("Write fail: %s", uv_err_name(ret));
     con->command_status= ASCORE_COMMAND_STATUS_SEND_FAILED;
     con->next_packet_queue_used= 0;
     con->local_errcode= ASRET_NET_WRITE_ERROR;
-    snprintf(con->errmsg, ASCORE_ERROR_BUFFER_SIZE, "Query send failed: %s", uv_err_name(uv_last_error(con->uv_objects.loop)));
+    attachsql_snprintf(con->errmsg, ASCORE_ERROR_BUFFER_SIZE, "Query send failed: %s", uv_err_name(ret));
     return con->command_status;
   }
 

diff --git a/src/ascore/common.h b/src/ascore/common.h
@@ -25,6 +25,7 @@
 #include "structs.h"
 #include <new>
 #include <uv.h>
+#include <libattachsql-1.0/attachsql.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>