Rename util.* to cl_util.*

8 files changed, 34 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 3efe726..e5719e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CFLAGS=-g
 
-COMMON_OBJECTS = cl_simple.o util.o
+COMMON_OBJECTS = cl_simple.o cl_util.o
 LDFLAGS = -L/usr/local/lib -lOpenCL
 
 
diff --git a/cl_simple.c b/cl_simple.c
index 82572ef..2752027 100644
--- a/cl_simple.c
+++ b/cl_simple.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include "cl_simple.h"
-#include "util.h"
+#include "cl_util.h"
 
 /*============================================================================*/
 /*========== DIRECT WRAPPERS =================================================*/
@@ -23,7 +23,7 @@ unsigned clSimpleCreateContext(cl_context * context, cl_device_id device_id)
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clCreateContext() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return 0;
    }
    return 1;
@@ -40,7 +40,7 @@ unsigned clSimpleCreateCommandQueue(cl_command_queue * command_queue,
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clCreateCommandQueue() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return 0;
    }
    return 1;
@@ -54,7 +54,7 @@ unsigned clSimpleKernelSetArg(cl_kernel kernel, cl_uint index, size_t size,
    error = clSetKernelArg(kernel, index, size, value);
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clSetKernelArg failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clSetKernelArg failed: %s\n", clUtilErrorString(error));
       return 0;
    }
 
@@ -78,7 +78,7 @@ unsigned clSimpleEnqueueNDRangeKernel(cl_command_queue command_queue,
                                   NULL); /* Event object for this event */
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clEnqueueNDRangeKernel() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return 0;
    }
 
@@ -105,7 +105,7 @@ unsigned clSimpleInitGpuDevice(cl_device_id * device_id)
                                                * found on the system */
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clGetPlatformIDs() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clGetPlatformIDs() failed: %s\n", clUtilErrorString(error));
       return 0;
    }
 
@@ -118,7 +118,7 @@ unsigned clSimpleInitGpuDevice(cl_device_id * device_id)
                           &total_gpu_devices);
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clGetDeviceIDs() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clGetDeviceIDs() failed: %s\n", clUtilErrorString(error));
       return 0;
    }
 
@@ -190,7 +190,7 @@ unsigned clSimpleCreateKernel(cl_context context, cl_device_id device_id,
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clCreateProgramWithSource() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return 0;
    }
 
@@ -215,7 +215,7 @@ unsigned clSimpleCreateKernel(cl_context context, cl_device_id device_id,
                                     NULL); /* Number of bytes written to the log */
       if (error != CL_SUCCESS) {
          fprintf(stderr, "clGetProgramBuildInfo() failed: %s\n",
-                          clCheckErrorString(error));
+                          clUtilErrorString(error));
       } else {
          fprintf(stderr, "Build Log: \n%s\n\n", build_str);
       }
@@ -227,7 +227,7 @@ unsigned clSimpleCreateKernel(cl_context context, cl_device_id device_id,
    *kernel = clCreateKernel(program, kernel_name, &error);
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clCreateKernel() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clCreateKernel() failed: %s\n", clUtilErrorString(error));
       return 0;
    }
 
@@ -271,7 +271,7 @@ unsigned clSimpleSetOutputBuffer(struct cl_simple_context * context,
                                &error); /* error code */
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clCreateBuffer() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clCreateBuffer() failed: %s\n", clUtilErrorString(error));
       return 0;
    }
 
@@ -298,7 +298,7 @@ unsigned clSimpleReadOutput(struct cl_simple_context * context, void * data,
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clEnqueueReadBuffer() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return 0;
    }
 
diff --git a/util.c b/cl_util.c
index 5ba3be9..20f80c6 100644
--- a/util.c
+++ b/cl_util.c
@@ -4,11 +4,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "util.h"
+#include "cl_util.h"
 
 #define CASE_ERR(ec) case ec: return #ec;
 
-const char * clCheckErrorString(cl_int error)
+const char * clUtilErrorString(cl_int error)
 {
    switch(error) {
 
diff --git a/util.h b/cl_util.h
index 1ebe991..7f01261 100644
--- a/util.h
+++ b/cl_util.h
@@ -1,6 +1,6 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-const char * clCheckErrorString(cl_int error);
+const char * clUtilErrorString(cl_int error);
 
 #endif /* UTIL_H */
diff --git a/get_global_id_2d.c b/get_global_id_2d.c
index 50b7db2..04aa309 100644
--- a/get_global_id_2d.c
+++ b/get_global_id_2d.c
@@ -5,7 +5,7 @@
 #include <CL/cl.h>
 
 #include "cl_simple.h"
-#include "util.h"
+#include "cl_util.h"
 
 #define GLOBAL_DIM_X 10
 #define GLOBAL_DIM_Y 10
diff --git a/hello_world.c b/hello_world.c
index c6247b6..8d88ee9 100644
--- a/hello_world.c
+++ b/hello_world.c
@@ -42,7 +42,7 @@ int main(int argc, char ** argv)
                                                * found on the system */
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clGetPlatformIDs() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clGetPlatformIDs() failed: %s\n", clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -57,7 +57,7 @@ int main(int argc, char ** argv)
                           &total_gpu_devices);
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clGetDeviceIDs() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clGetDeviceIDs() failed: %s\n", clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -71,7 +71,7 @@ int main(int argc, char ** argv)
                            &error); /* Error code */
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clCreateContext() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clCreateContext() failed: %s\n", clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -84,7 +84,7 @@ int main(int argc, char ** argv)
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clCreateCommandQueue() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -99,7 +99,7 @@ int main(int argc, char ** argv)
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clCreateProgramWithSource() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -123,7 +123,7 @@ int main(int argc, char ** argv)
                                     NULL); /* Number of bytes written to the log */
       if (error != CL_SUCCESS) {
          fprintf(stderr, "clGetProgramBuildInfo() failed: %s\n",
-                          clCheckErrorString(error));
+                          clUtilErrorString(error));
       } else {
          fprintf(stderr, "Build Log: \n%s\n\n", build_str);
       }
@@ -135,7 +135,7 @@ int main(int argc, char ** argv)
    kernel = clCreateKernel(program, "pi", &error);
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clCreateKernel() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clCreateKernel() failed: %s\n", clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -148,7 +148,7 @@ int main(int argc, char ** argv)
                                &error); /* error code */
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clCreateBuffer() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clCreateBuffer() failed: %s\n", clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -160,7 +160,7 @@ int main(int argc, char ** argv)
                           &out_buffer);
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clSetKernelArg failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clSetKernelArg failed: %s\n", clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -179,7 +179,7 @@ int main(int argc, char ** argv)
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clEnqueueNDRangeKernel() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -198,7 +198,7 @@ int main(int argc, char ** argv)
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clEnqueueReadBuffer() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
diff --git a/loop.c b/loop.c
index 39f2db1..af94dcb 100644
--- a/loop.c
+++ b/loop.c
@@ -5,7 +5,7 @@
 #include <CL/cl.h>
 
 #include "cl_simple.h"
-#include "util.h"
+#include "cl_util.h"
 
 int main (int argc, char ** argv)
 {
diff --git a/math-int.c b/math-int.c
index 56394b8..8d0cf4c 100644
--- a/math-int.c
+++ b/math-int.c
@@ -38,7 +38,7 @@ int main(int argc, char ** argv)
                            &error); /* Error code */
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clCreateContext() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clCreateContext() failed: %s\n", clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -51,7 +51,7 @@ int main(int argc, char ** argv)
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clCreateCommandQueue() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -68,7 +68,7 @@ int main(int argc, char ** argv)
                                &error); /* error code */
 
    if (error != CL_SUCCESS) {
-      fprintf(stderr, "clCreateBuffer() failed: %s\n", clCheckErrorString(error));
+      fprintf(stderr, "clCreateBuffer() failed: %s\n", clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -92,7 +92,7 @@ int main(int argc, char ** argv)
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clEnqueueNDRangeKernel() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return EXIT_FAILURE;
    }
 
@@ -111,7 +111,7 @@ int main(int argc, char ** argv)
 
    if (error != CL_SUCCESS) {
       fprintf(stderr, "clEnqueueReadBuffer() failed: %s\n",
-                      clCheckErrorString(error));
+                      clUtilErrorString(error));
       return EXIT_FAILURE;
    }