From 607036db7d0fcd4433a3bb1f02aa7a692599199c Mon Sep 17 00:00:00 2001 From: "cantab.net!aia21" Date: Fri, 5 Mar 2004 11:23:42 +0000 Subject: [PATCH] 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) --- include/ntfs/device.h | 2 +- libntfs/device.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/ntfs/device.h b/include/ntfs/device.h index b6d0aace..7db9b0e7 100644 --- a/include/ntfs/device.h +++ b/include/ntfs/device.h @@ -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, diff --git a/libntfs/device.c b/libntfs/device.c index f66b5e42..dc451d03 100644 --- a/libntfs/device.c +++ b/libntfs/device.c @@ -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; }