#include "fileref.h"
#include "stream.h"
-extern GPrivate *glk_data_key;
+extern GPrivate glk_data_key;
/**
* glkunix_stream_open_pathname_gen:
strid_t
glkunix_stream_open_pathname_gen(char *pathname, glui32 writemode, glui32 textmode, glui32 rock)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
if(!glk_data->in_startup)
ILLEGAL("glkunix_stream_open_pathname_gen() may only be called from "
g_return_val_if_fail(pathname, NULL);
g_return_val_if_fail(strlen(pathname) > 0, NULL);
- frefid_t fileref = fileref_new(pathname, rock,
+ frefid_t fileref = fileref_new(pathname, NULL, rock,
textmode? fileusage_TextMode : fileusage_BinaryMode,
writemode? filemode_Write : filemode_Read);
return file_stream_new(fileref, writemode? filemode_Write : filemode_Read, rock, FALSE);
strid_t
glkunix_stream_open_pathname(char *pathname, glui32 textmode, glui32 rock)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
if(!glk_data->in_startup)
ILLEGAL("glkunix_stream_open_pathname() may only be called from "
g_return_val_if_fail(pathname, NULL);
g_return_val_if_fail(strlen(pathname) > 0, NULL);
- frefid_t fileref = fileref_new(pathname, rock, textmode? fileusage_TextMode : fileusage_BinaryMode, filemode_Read);
+ frefid_t fileref = fileref_new(pathname, NULL, rock, textmode? fileusage_TextMode : fileusage_BinaryMode, filemode_Read);
return file_stream_new(fileref, filemode_Read, rock, FALSE);
}
g_return_if_fail(filename);
g_return_if_fail(strlen(filename) > 0);
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
+ ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key);
+
gchar *dirname = g_path_get_dirname(filename);
if(!g_file_test(dirname, G_FILE_TEST_IS_DIR))
{
g_slist_free(arglist);
return TRUE;
-}
\ No newline at end of file
+}