diff options
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/common-utils.h | 4 | ||||
| -rw-r--r-- | libglusterfs/src/gfdb/gfdb_data_store_helper.c | 7 | ||||
| -rw-r--r-- | libglusterfs/src/gfdb/gfdb_sqlite3.c | 3 | ||||
| -rw-r--r-- | libglusterfs/src/graph.y | 5 |
4 files changed, 11 insertions, 8 deletions
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index bf574fdabc7..1c9ef13b80a 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -362,11 +362,11 @@ union gf_sock_union { do {\ entry = NULL;\ if (dir) { \ - entry = readdir (dir); \ + entry = sys_readdir (dir); \ while (entry && (!strcmp (entry->d_name, ".") || \ !fnmatch ("*.tmp", entry->d_name, 0) || \ !strcmp (entry->d_name, ".."))) { \ - entry = readdir (dir); \ + entry = sys_readdir (dir); \ } \ } \ } while (0) diff --git a/libglusterfs/src/gfdb/gfdb_data_store_helper.c b/libglusterfs/src/gfdb/gfdb_data_store_helper.c index ff85e17169d..6d7d5c58d32 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store_helper.c +++ b/libglusterfs/src/gfdb/gfdb_data_store_helper.c @@ -1,5 +1,6 @@ -#include "gfdb_data_store_helper.h" +#include "gfdb_data_store_helper.h" +#include "syscall.h" /*Create a single link info structure*/ gfdb_link_info_t* @@ -542,7 +543,7 @@ gfdb_read_query_record (int fd, /* Read serialized query record length from the file*/ - ret = read (fd, &buffer_len, sizeof (int32_t)); + ret = sys_read (fd, &buffer_len, sizeof (int32_t)); if (ret < 0) { gf_msg (GFDB_DATA_STORE, GF_LOG_ERROR, 0, LG_MSG_DB_ERROR, "Failed reading buffer length" @@ -568,7 +569,7 @@ gfdb_read_query_record (int fd, /* Read the serialized query record from file */ read_len = buffer_len; read_buffer = buffer; - while ((ret = read (fd, read_buffer, read_len)) < read_len) { + while ((ret = sys_read (fd, read_buffer, read_len)) < read_len) { /*Any error */ if (ret < 0) { diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c index adbbac4233f..e45a21d66c8 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c @@ -11,6 +11,7 @@ #include "gfdb_sqlite3.h" #include "gfdb_sqlite3_helper.h" #include "libglusterfs-messages.h" +#include "syscall.h" /****************************************************************************** * @@ -430,7 +431,7 @@ gf_sqlite3_init (dict_t *args, void **db_conn) { strncpy(sql_conn->sqlite3_db_path, temp_str, PATH_MAX-1); sql_conn->sqlite3_db_path[PATH_MAX-1] = 0; - is_dbfile_exist = (stat (sql_conn->sqlite3_db_path, &stbuf) == 0) ? + is_dbfile_exist = (sys_stat (sql_conn->sqlite3_db_path, &stbuf) == 0) ? _gf_true : _gf_false; /*Creates DB if not created*/ diff --git a/libglusterfs/src/graph.y b/libglusterfs/src/graph.y index 9fd02823a6c..8ac01a25177 100644 --- a/libglusterfs/src/graph.y +++ b/libglusterfs/src/graph.y @@ -25,6 +25,7 @@ #include "xlator.h" #include "graph-utils.h" #include "logging.h" +#include "syscall.h" #include "libglusterfs-messages.h" static int new_volume (char *name); @@ -565,7 +566,7 @@ glusterfs_graph_construct (FILE *fp) if (-1 == tmp_fd) goto err; - ret = unlink (template); + ret = sys_unlink (template); if (ret < 0) { gf_msg ("parser", GF_LOG_WARNING, 0, LG_MSG_FILE_OP_FAILED, "Unable to delete file: %s", template); @@ -606,7 +607,7 @@ err: gf_msg ("parser", GF_LOG_ERROR, 0, LG_MSG_FILE_OP_FAILED, "cannot create temporary file"); if (-1 != tmp_fd) - close (tmp_fd); + sys_close (tmp_fd); } glusterfs_graph_destroy (graph); |