opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename private to priv_data in ntfs_device_alloc() to avoid name 

space clashes with C++.  (Yuval Fledel, modified fix by me)

(Logical change 1.295)
edge.strict_endians
cantab.net!aia21 2004-03-05 11:23:42 +00:00
parent 61115edf14
commit 607036db7d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ntfs/device.h
View File

@ -89,7 +89,7 @@ struct ntfs_device_operations {
};
extern struct ntfs_device *ntfs_device_alloc(const char *name, const long state,
struct ntfs_device_operations *dops, void *private);
struct ntfs_device_operations *dops, void *priv_data);
extern int ntfs_device_free(struct ntfs_device *dev);
extern s64 ntfs_pread(struct ntfs_device *dev, const s64 pos, s64 count,

8
libntfs/device.c
View File

@ -51,11 +51,11 @@
* name: name of the device (must be present)
* state: initial device state (usually zero)
* dops: ntfs device operations to use with the device (must be present)
* private: pointer to private data (optional)
* priv_data: pointer to private data (optional)
*
* Allocate an ntfs device structure and pre-initialize it with the user-
* specified device operations @dops, device state @state, device name @name,
* and optional private data @private.
* and optional private data @priv_data.
*
* Note, @name is copied and can hence be freed after this functions returns.
*
@ -63,7 +63,7 @@
* error return NULL with errno set to the error code returned by malloc().
*/
struct ntfs_device *ntfs_device_alloc(const char *name, const long state,
struct ntfs_device_operations *dops, void *private)
struct ntfs_device_operations *dops, void *priv_data)
{
struct ntfs_device *dev;
@ -82,7 +82,7 @@ struct ntfs_device *ntfs_device_alloc(const char *name, const long state,
}
dev->d_ops = dops;
dev->d_state = state;
dev->d_private = private;
dev->d_private = priv_data;
}
return dev;
}