projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent unnecessary regeneration of VAPI
[projects/chimara/chimara.git]
/
libchimara
/
stream.c
diff --git
a/libchimara/stream.c
b/libchimara/stream.c
index b9d56cd03d4c055444a4198bfdfa067f7b3de7cd..96ab73fb08dcc97c8857541c0d91bafedbe7b33b 100644
(file)
--- a/
libchimara/stream.c
+++ b/
libchimara/stream.c
@@
-284,6
+284,7
@@
glk_stream_open_memory(char *buf, glui32 buflen, glui32 fmode, glui32 rock)
str->file_mode = fmode;
str->type = STREAM_TYPE_MEMORY;
str->mark = 0;
str->file_mode = fmode;
str->type = STREAM_TYPE_MEMORY;
str->mark = 0;
+ str->endmark = 0;
str->unicode = FALSE;
if(buf && buflen)
str->unicode = FALSE;
if(buf && buflen)
@@
-322,6
+323,7
@@
glk_stream_open_memory_uni(glui32 *buf, glui32 buflen, glui32 fmode, glui32 rock
str->file_mode = fmode;
str->type = STREAM_TYPE_MEMORY;
str->mark = 0;
str->file_mode = fmode;
str->type = STREAM_TYPE_MEMORY;
str->mark = 0;
+ str->endmark = 0;
str->unicode = TRUE;
if(buf && buflen)
str->unicode = TRUE;
if(buf && buflen)
@@
-342,7
+344,7
@@
file_stream_new(frefid_t fileref, glui32 fmode, glui32 rock, gboolean unicode)
{
VALID_FILEREF(fileref, return NULL);
{
VALID_FILEREF(fileref, return NULL);
- gchar *modestr;
+
const
gchar *modestr;
/* Binary mode is 0x000, text mode 0x100 */
gboolean binary = !(fileref->usage & fileusage_TextMode);
switch(fmode)
/* Binary mode is 0x000, text mode 0x100 */
gboolean binary = !(fileref->usage & fileusage_TextMode);
switch(fmode)
@@
-352,10
+354,10
@@
file_stream_new(frefid_t fileref, glui32 fmode, glui32 rock, gboolean unicode)
ILLEGAL_PARAM("Tried to open a nonexistent file, '%s', in read mode", fileref->filename);
return NULL;
}
ILLEGAL_PARAM("Tried to open a nonexistent file, '%s', in read mode", fileref->filename);
return NULL;
}
- modestr =
g_strdup(binary? "rb" : "r")
;
+ modestr =
binary? "rb" : "r"
;
break;
case filemode_Write:
break;
case filemode_Write:
- modestr =
g_strdup(binary? "wb" : "w")
;
+ modestr =
binary? "wb" : "w"
;
break;
case filemode_WriteAppend:
case filemode_ReadWrite:
break;
case filemode_WriteAppend:
case filemode_ReadWrite:
@@
-367,7
+369,7
@@
file_stream_new(frefid_t fileref, glui32 fmode, glui32 rock, gboolean unicode)
IO_WARNING( "Error opening file", fileref->filename, g_strerror(errno) );
return NULL;
}
IO_WARNING( "Error opening file", fileref->filename, g_strerror(errno) );
return NULL;
}
- modestr =
g_strdup(binary? "r+b" : "r+")
;
+ modestr =
binary? "r+b" : "r+"
;
}
break;
default:
}
break;
default:
@@
-376,7
+378,6
@@
file_stream_new(frefid_t fileref, glui32 fmode, glui32 rock, gboolean unicode)
}
FILE *fp = g_fopen(fileref->filename, modestr);
}
FILE *fp = g_fopen(fileref->filename, modestr);
- g_free(modestr);
if(fp == NULL) {
IO_WARNING( "Error opening file", fileref->filename, g_strerror(errno) );
return NULL;
if(fp == NULL) {
IO_WARNING( "Error opening file", fileref->filename, g_strerror(errno) );
return NULL;