Renamed error/2 due to name collision in libc

squidfunk · Oct 8, 2013 · c18aaa7 · c18aaa7
1 parent 93d1992
commit c18aaa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/c_src/gen_driver.c b/c_src/gen_driver.c
@@ -76,7 +76,7 @@ async(void *data) {
     gd_trd_t *trd = ptr->trd_state;
     if (trd[t].tid == 0 && (trd[t].tid = tid))
       if ((trd[t].state = thread_init()) == NULL)
-        return error(ptr->res, GD_ERR_MEM);
+        return error_set(ptr->res, GD_ERR_MEM);
 
     /* Select thread-specific state */
     if (trd[t].tid == tid && (trd_state = trd[t].state))
@@ -157,7 +157,7 @@ ready(ErlDrvData drv_data, ErlDrvThreadData thread_data) {
   /* Check, if we reached the end of the request buffer */
   ei_decode_list_header(ptr->req->buf, &ptr->req->index, NULL);
   if (!error_occurred(ptr->res) && ptr->req->len != ptr->req->index)
-    error(ptr->res, GD_ERR_DEC);
+    error_set(ptr->res, GD_ERR_DEC);
 
   /* Check for error on synchronous request, output data */
   if (ptr->req->syn) {
@@ -259,7 +259,7 @@ control(ErlDrvData drv_data, unsigned int cmd, char *buf,
  * Set an error to be returned by the driver.
  */
 void
-error(gd_res_t *res, char *error) {
+error_set(gd_res_t *res, char *error) {
   strcpy(res->error, error);
   res->error[strlen(error)] = 0;
 }

diff --git a/c_src/gen_driver.h b/c_src/gen_driver.h
@@ -103,7 +103,7 @@ ErlDrvSSizeT control(ErlDrvData drv_data, unsigned int cmd, char *buf,
 /**
  * Helper functions to ease communication.
  */
-void error(gd_res_t *res, char *error);
+void error_set(gd_res_t *res, char *error);
 int error_occurred(gd_res_t *res);
 
 /* ----------------------------------------------------------------------------