X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fglkunix.c;h=13b44ec4fb91eb38b58bd55f287df7fa371826c1;hb=c6e78c57fc1b323ec055bfe48c7430515be27d1c;hp=ee1194357682a1b8ae619006663a136c013989b0;hpb=3d656f9b1002c4b32b7fd27636568e4873a89020;p=rodin%2Fchimara.git diff --git a/libchimara/glkunix.c b/libchimara/glkunix.c index ee11943..13b44ec 100644 --- a/libchimara/glkunix.c +++ b/libchimara/glkunix.c @@ -7,12 +7,12 @@ #include "fileref.h" #include "stream.h" -extern ChimaraGlkPrivate *glk_data; +extern GPrivate *glk_data_key; /** * glkunix_stream_open_pathname: * @pathname: A path to a file, in the system filename encoding. - * @usage: Bitfield with one or more of the fileusage_ constants. + * @textmode: Bitfield with one or more of the fileusage_ constants. * @rock: The new stream's rock value. * * Opens an arbitrary file, in read-only mode. Note that this function is @@ -23,8 +23,10 @@ extern ChimaraGlkPrivate *glk_data; * Returns: A new stream, or %NULL if the file operation failed. */ strid_t -glkunix_stream_open_pathname(char *pathname, glui32 usage, glui32 rock) +glkunix_stream_open_pathname(char *pathname, glui32 textmode, glui32 rock) { + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + if(!glk_data->in_startup) ILLEGAL("glkunix_stream_open_pathname() may only be called from " "glkunix_startup_code()."); @@ -53,6 +55,8 @@ glkunix_set_base_file(char *filename) { g_return_if_fail(filename); g_return_if_fail(strlen(filename) > 0); + + 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))