aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/fs/directory.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/fs/directory.c')
-rw-r--r--src/plugins/fs/directory.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
index 12ca0bff..3d72db4a 100644
--- a/src/plugins/fs/directory.c
+++ b/src/plugins/fs/directory.c
@@ -68,11 +68,11 @@ selectFile ()
68 68
69static int 69static int
70spcb (const ECRS_FileInfo * fi, 70spcb (const ECRS_FileInfo * fi,
71 const HashCode512 * key, int isRoot, void *closure) 71 const GNUNET_HashCode * key, int isRoot, void *closure)
72{ 72{
73 SearchList *list = closure; 73 SearchList *list = closure;
74 fs_search_result_received (list, fi, list->uri); 74 fs_search_result_received (list, fi, list->uri);
75 return OK; 75 return GNUNET_OK;
76} 76}
77 77
78 78
@@ -93,19 +93,19 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
93 dn = selectFile (); 93 dn = selectFile ();
94 if (dn == NULL) 94 if (dn == NULL)
95 return; 95 return;
96 if ((YES != disk_file_test (NULL, 96 if ((GNUNET_YES != GNUNET_disk_file_test (NULL,
97 dn)) || 97 dn)) ||
98 (OK != disk_file_size (NULL, dn, &directory_data_len, YES))) 98 (GNUNET_OK != GNUNET_disk_file_size (NULL, dn, &directory_data_len, GNUNET_YES)))
99 { 99 {
100 addLogEntry (_("Error accessing file `%s'."), dn); 100 addLogEntry (_("Error accessing file `%s'."), dn);
101 FREE (dn); 101 GNUNET_free (dn);
102 return; 102 return;
103 } 103 }
104 fd = disk_file_open (NULL, dn, O_LARGEFILE | O_RDONLY); 104 fd = GNUNET_disk_file_open (NULL, dn, O_LARGEFILE | O_RDONLY);
105 if (fd == -1) 105 if (fd == -1)
106 { 106 {
107 addLogEntry (_("Error opening file `%s'."), dn); 107 addLogEntry (_("Error opening file `%s'."), dn);
108 FREE (dn); 108 GNUNET_free (dn);
109 return; 109 return;
110 } 110 }
111 dlen = (size_t) directory_data_len; 111 dlen = (size_t) directory_data_len;
@@ -114,7 +114,7 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
114 { 114 {
115 addLogEntry (_("Error mapping file `%s' into memory."), dn); 115 addLogEntry (_("Error mapping file `%s' into memory."), dn);
116 CLOSE (fd); 116 CLOSE (fd);
117 FREE (dn); 117 GNUNET_free (dn);
118 return; 118 return;
119 } 119 }
120 kws[0] = dn; 120 kws[0] = dn;
@@ -129,7 +129,7 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
129 ECRS_freeMetaData (md); 129 ECRS_freeMetaData (md);
130 MUNMAP (directory_data, dlen); 130 MUNMAP (directory_data, dlen);
131 CLOSE (fd); 131 CLOSE (fd);
132 FREE (dn); 132 GNUNET_free (dn);
133 133
134 /* switch view -- select directory */ 134 /* switch view -- select directory */
135 notebook 135 notebook