projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
data
/
file-handle-def.c
diff --git
a/src/data/file-handle-def.c
b/src/data/file-handle-def.c
index 9a46bfad43c851b4d87759c8d9dca1ab3ee4fbaf..121a4909c43cf6793acf4c09dc6643ccdd3a209f 100644
(file)
--- a/
src/data/file-handle-def.c
+++ b/
src/data/file-handle-def.c
@@
-176,11
+176,10
@@
fh_from_id (const char *id)
struct file_handle *handle;
HMAP_FOR_EACH_WITH_HASH (handle, struct file_handle, name_node,
struct file_handle *handle;
HMAP_FOR_EACH_WITH_HASH (handle, struct file_handle, name_node,
- hash_case_string (id, 0), &named_handles)
- if (!strcasecmp (id, handle->id))
+
utf8_
hash_case_string (id, 0), &named_handles)
+ if (!
utf8_
strcasecmp (id, handle->id))
{
{
- handle->ref_cnt++;
- return handle;
+ return fh_ref (handle);
}
return NULL;
}
return NULL;
@@
-206,10
+205,8
@@
create_handle (const char *id, char *handle_name, enum fh_referent referent,
if (id != NULL)
{
if (id != NULL)
{
- assert (fh_from_id (id) == NULL);
hmap_insert (&named_handles, &handle->name_node,
hmap_insert (&named_handles, &handle->name_node,
- hash_case_string (handle->id, 0));
- handle->ref_cnt++;
+ utf8_hash_case_string (handle->id, 0));
}
return handle;
}
return handle;
@@
-221,7
+218,6
@@
create_handle (const char *id, char *handle_name, enum fh_referent referent,
struct file_handle *
fh_inline_file (void)
{
struct file_handle *
fh_inline_file (void)
{
- fh_ref (inline_file);
return inline_file;
}
return inline_file;
}
@@
-356,7
+352,7
@@
fh_get_dataset (const struct file_handle *handle)
struct file_handle *
fh_get_default_handle (void)
{
struct file_handle *
fh_get_default_handle (void)
{
- return default_handle ?
fh_ref (default_handle)
: fh_inline_file ();
+ return default_handle ?
default_handle
: fh_inline_file ();
}
/* Sets NEW_DEFAULT_HANDLE as the default handle. */
}
/* Sets NEW_DEFAULT_HANDLE as the default handle. */
@@
-365,7
+361,7
@@
fh_set_default_handle (struct file_handle *new_default_handle)
{
assert (new_default_handle == NULL
|| (new_default_handle->referent & (FH_REF_INLINE | FH_REF_FILE)));
{
assert (new_default_handle == NULL
|| (new_default_handle->referent & (FH_REF_INLINE | FH_REF_FILE)));
- if (default_handle != NULL)
+ if (default_handle != NULL
&& default_handle != inline_file
)
fh_unref (default_handle);
default_handle = new_default_handle;
if (default_handle != NULL)
fh_unref (default_handle);
default_handle = new_default_handle;
if (default_handle != NULL)