X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-handle-def.h;h=df9a757835520df6cce509ee8019764c96c8faf1;hb=f14ad7d1cee6228053fbadadfee9c86eb80da765;hp=a57d3d72e5c50eed2112be2650b200f89c61d97b;hpb=c43455db6f3f1191d969c42b8e679e0fddc44e78;p=pspp diff --git a/src/data/file-handle-def.h b/src/data/file-handle-def.h index a57d3d72e5..df9a757835 100644 --- a/src/data/file-handle-def.h +++ b/src/data/file-handle-def.h @@ -17,6 +17,7 @@ #ifndef FILE_HANDLE_DEF_H #define FILE_HANDLE_DEF_H +#include "libpspp/compiler.h" #include #include @@ -81,13 +82,12 @@ struct file_handle *fh_create_dataset (struct dataset *); const struct fh_properties *fh_default_properties (void); /* Reference management. */ -struct file_handle *fh_ref (struct file_handle *); +struct file_handle *fh_ref (struct file_handle *) WARN_UNUSED_RESULT; void fh_unref (struct file_handle *); void fh_unname (struct file_handle *); /* Finding file handles. */ struct file_handle *fh_from_id (const char *handle_name); -struct file_handle *fh_from_file_name (const char *file_name); struct file_handle *fh_inline_file (void); /* Generic properties of file handles. */ @@ -96,8 +96,11 @@ const char *fh_get_name (const struct file_handle *); enum fh_referent fh_get_referent (const struct file_handle *); const char *fh_get_encoding (const struct file_handle *); +bool fh_equal (const struct file_handle *, const struct file_handle *); + /* Properties of FH_REF_FILE file handles. */ const char *fh_get_file_name (const struct file_handle *); +const char *fh_get_file_name_encoding (const struct file_handle *handle); enum fh_mode fh_get_mode (const struct file_handle *) ; enum fh_line_ends fh_get_line_ends (const struct file_handle *);