projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work on SAVE DATA COLLECTION
[pspp]
/
src
/
data
/
file-handle-def.c
diff --git
a/src/data/file-handle-def.c
b/src/data/file-handle-def.c
index ba45cb6d9d1bacfcf7fc0e825126b8fc092e2da5..4c4820cb12a08fddfc025890fd1f02afd45bb035 100644
(file)
--- a/
src/data/file-handle-def.c
+++ b/
src/data/file-handle-def.c
@@
-24,7
+24,6
@@
#include <string.h>
#include "data/dataset.h"
#include <string.h>
#include "data/dataset.h"
-#include "data/file-name.h"
#include "data/variable.h"
#include "libpspp/cast.h"
#include "libpspp/compiler.h"
#include "data/variable.h"
#include "libpspp/cast.h"
#include "libpspp/compiler.h"
@@
-91,7
+90,7
@@
static void unname_handle (struct file_handle *);
/* Hash table of all active locks. */
static struct hmap locks = HMAP_INITIALIZER (locks);
/* Hash table of all active locks. */
static struct hmap locks = HMAP_INITIALIZER (locks);
-struct file_identity *fh_get_identity (const struct file_handle *);
+st
atic st
ruct file_identity *fh_get_identity (const struct file_handle *);
static void fh_free_identity (struct file_identity *);
static int fh_compare_file_identities (const struct file_identity *,
const struct file_identity *);
static void fh_free_identity (struct file_identity *);
static int fh_compare_file_identities (const struct file_identity *,
const struct file_identity *);
@@
-523,7
+522,7
@@
fh_lock (struct file_handle *h, enum fh_referent mask UNUSED,
return NULL;
}
lock->open_cnt++;
return NULL;
}
lock->open_cnt++;
-
+
free_key (key);
free (key);
free_key (key);
free (key);
@@
-702,17
+701,15
@@
struct file_identity
/* Returns a pointer to a dynamically allocated structure whose
value can be used to tell whether two files are actually the
/* Returns a pointer to a dynamically allocated structure whose
value can be used to tell whether two files are actually the
- same file. Returns a null pointer if no information about the
- file is available, perhaps because it does not exist. The
- caller is responsible for freeing the structure with
+ same file. The caller is responsible for freeing the structure with
fh_free_identity() when finished. */
fh_free_identity() when finished. */
-struct file_identity *
+st
atic st
ruct file_identity *
fh_get_identity (const struct file_handle *fh)
{
struct file_identity *identity = xmalloc (sizeof *identity);
const char *file_name = fh_get_file_name (fh);
fh_get_identity (const struct file_handle *fh)
{
struct file_identity *identity = xmalloc (sizeof *identity);
const char *file_name = fh_get_file_name (fh);
-
+
#if !(defined _WIN32 || defined __WIN32__)
struct stat s;
if (lstat (file_name, &s) == 0)
#if !(defined _WIN32 || defined __WIN32__)
struct stat s;
if (lstat (file_name, &s) == 0)
@@
-764,7
+761,7
@@
fh_get_identity (const struct file_handle *fh)
size_t bufsize;
size_t pathlen = 255;
char *cname = NULL;
size_t bufsize;
size_t pathlen = 255;
char *cname = NULL;
- do
+ do
{
bufsize = pathlen;
cname = xrealloc (cname, bufsize);
{
bufsize = pathlen;
cname = xrealloc (cname, bufsize);