Fix last style issues.

Author: abergeron

src/gpuarray_buffer_cuda.c

@@ -129,7 +129,6 @@ static int setup_done = 0;
 static int major = -1;
 static int minor = -1;
 static int setup_lib(void) {
-  const char *ver;
   CUresult err;
   int res, tmp;
 
@@ -152,12 +151,15 @@ static int setup_lib(void) {
       int versions[][2] = {{8, 0}, {7, 5}, {7, 0}};
       int versions_length = sizeof(versions) / sizeof(versions[0]);
       int i = 0;
+      /* Skip versions that are higher or equal to the driver version */
+      while (versions[i][0] > major ||
+             (versions[i][0] == major && versions[i][1] >= minor)) i++;
       do {
         major = versions[i][0];
         minor = versions[i][1];
         res = load_libnvrtc(major, minor, global_err);
-        ++i;
-      } while(res != GA_NO_ERROR && i < versions_length);
+        i++;
+      } while (res != GA_NO_ERROR && i < versions_length);
     }
     if (res != GA_NO_ERROR)
       return res;

src/loaders/libcublas.c

@@ -47,9 +47,9 @@ int load_libcublas(int major, int minor, error *e) {
     #ifdef DEBUG
     fprintf(stderr, "Loading cuBLAS %d.%d.\n", major, minor);
     #endif
-    n = snprintf(libname, 64, "cublas64_%d%d.dll", major, minor);
-    if (n < 0 || n >= 64)
-      return error_set(e, GA_SYS_ERROR, "cublas library name too long.");
+    n = snprintf(libname, sizeof(libname), "cublas64_%d%d.dll", major, minor);
+    if (n < 0 || n >= sizeof(libname))
+      return error_set(e, GA_SYS_ERROR, "snprintf");
     lib = ga_load_library(libname, e);
   }
 #else /* Unix */
@@ -60,9 +60,9 @@ int load_libcublas(int major, int minor, error *e) {
     #ifdef DEBUG
     fprintf(stderr, "Loading cuBLAS %d.%d.\n", major, minor);
     #endif
-    n = snprintf(libname, 128, "/Developer/NVIDIA/CUDA-%d.%d/lib/libcublas.dylib", major, minor);
-    if (n < 0 || n >= 128)
-      return error_set(e, GA_SYS_ERROR, "cublas library path too long.");
+    n = snprintf(libname, sizeof(libname), "/Developer/NVIDIA/CUDA-%d.%d/lib/libcublas.dylib", major, minor);
+    if (n < 0 || n >= sizeof(libname))
+      return error_set(e, GA_SYS_ERROR, "snprintf");
     lib = ga_load_library(libname, e);
   }
 #else

src/loaders/libnvrtc.c

@@ -33,24 +33,23 @@ int load_libnvrtc(int major, int minor, error *e) {
     #ifdef DEBUG
     fprintf(stderr, "Loading nvrtc %d.%d.\n", major, minor);
     #endif
-    n = snprintf(libname, 64, "nvrtc64_%d%d.dll", major, minor);
-    if (n < 0 || n >= 64)
-      return error_set(e, GA_SYS_ERROR, "nvrtc library name too long.");
+    n = snprintf(libname, sizeof(libname), "nvrtc64_%d%d.dll", major, minor);
+    if (n < 0 || n >= sizeof(libname))
+      return error_set(e, GA_SYS_ERROR, "snprintf");
 
     lib = ga_load_library(libname, e);
   }
 #else /* Unix */
 #ifdef __APPLE__
   {
-    /* Try the usual fullpath first */
     char libname[128];
     int n;
     #ifdef DEBUG
     fprintf(stderr, "Loading nvrtc %d.%d.\n", major, minor);
     #endif
-    n = snprintf(libname, 128, "/Developer/NVIDIA/CUDA-%d.%d/lib/libnvrtc.dylib", major, minor);
-    if (n < 0 || n >= 128)
-      return error_set(e, GA_SYS_ERROR, "nvrtc library path too long.");
+    n = snprintf(libname, sizeof(libname), "/Developer/NVIDIA/CUDA-%d.%d/lib/libnvrtc.dylib", major, minor);
+    if (n < 0 || n >= sizeof(libname))
+      return error_set(e, GA_SYS_ERROR, "snprintf");
     lib = ga_load_library(libname, e);
   }
 #else