Changes in uspace/srv/vfs/vfs_file.c [1433ecda:777832e] in mainline

File:

• uspace/srv/vfs/vfs_file.c (modified) (7 diffs)

uspace/srv/vfs/vfs_file.c

@@ -71 +71 @@
         fibril_mutex_lock(&vfs_data->lock);
         if (!vfs_data->files) {
-                vfs_data->files = malloc(MAX_OPEN_FILES * sizeof(vfs_file_t *));
+                vfs_data->files = malloc(VFS_MAX_OPEN_FILES * sizeof(vfs_file_t *));
                 if (!vfs_data->files) {
                         fibril_mutex_unlock(&vfs_data->lock);
                         return false;
                 }
-                memset(vfs_data->files, 0, MAX_OPEN_FILES * sizeof(vfs_file_t *));
+                memset(vfs_data->files, 0, VFS_MAX_OPEN_FILES * sizeof(vfs_file_t *));
         }
         fibril_mutex_unlock(&vfs_data->lock);
@@ -90 +90 @@
                 return;
 
-        for (i = 0; i < MAX_OPEN_FILES; i++) {
+        for (i = 0; i < VFS_MAX_OPEN_FILES; i++) {
                 if (vfs_data->files[i])
                         (void) _vfs_fd_free(vfs_data, i);
@@ -199 +199 @@
         unsigned int i;
         if (desc)
-                i = MAX_OPEN_FILES - 1;
+                i = VFS_MAX_OPEN_FILES - 1;
         else
                 i = 0;
@@ -233 +233 @@
                         i--;
                 } else {
-                        if (i == MAX_OPEN_FILES - 1)
+                        if (i == VFS_MAX_OPEN_FILES - 1)
                                 break;
 
@@ -261 +261 @@
 static errno_t _vfs_fd_free_locked(vfs_client_data_t *vfs_data, int fd)
 {
-        if ((fd < 0) || (fd >= MAX_OPEN_FILES) || !vfs_data->files[fd]) {
+        if ((fd < 0) || (fd >= VFS_MAX_OPEN_FILES) || !vfs_data->files[fd]) {
                 return EBADF;
         }
@@ -311 +311 @@
 
         fibril_mutex_lock(&VFS_DATA->lock);
-        if ((fd < 0) || (fd >= MAX_OPEN_FILES)) {
+        if ((fd < 0) || (fd >= VFS_MAX_OPEN_FILES)) {
                 fibril_mutex_unlock(&VFS_DATA->lock);
                 return EBADF;
@@ -342 +342 @@
 
         fibril_mutex_lock(&vfs_data->lock);
-        if ((fd >= 0) && (fd < MAX_OPEN_FILES)) {
+        if ((fd >= 0) && (fd < VFS_MAX_OPEN_FILES)) {
                 vfs_file_t *file = vfs_data->files[fd];
                 if (file != NULL) {