Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv17281/libntfs
Modified Files:
attrib.c bitmap.c compress.c device.c dir.c inode.c runlist.c
win32_io.c
Log Message:
Remove inline keywords from static non-one-liners of '.c' files.
Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- attrib.c 25 Oct 2006 18:57:15 -0000 1.224
+++ attrib.c 26 Oct 2006 19:10:05 -0000 1.225
@@ -274,7 +274,7 @@ s64 ntfs_get_attribute_value(const ntfs_
*
* Initialize the ntfs attribute @na with @ni, @type, @name, and @name_len.
*/
-static __inline__ void __ntfs_attr_init(ntfs_attr *na, ntfs_inode *ni,
+static void __ntfs_attr_init(ntfs_attr *na, ntfs_inode *ni,
const ATTR_TYPES type, ntfschar *name, const u32 name_len)
{
na->rl = NULL;
@@ -2264,7 +2264,7 @@ int ntfs_attr_lookup(const ATTR_TYPES ty
*
* Initialize the attribute search context @ctx with @ni and @mrec.
*/
-static __inline__ void ntfs_attr_init_search_ctx(ntfs_attr_search_ctx *ctx,
+static void ntfs_attr_init_search_ctx(ntfs_attr_search_ctx *ctx,
ntfs_inode *ni, MFT_RECORD *mrec)
{
if (!mrec)
Index: bitmap.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/bitmap.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- bitmap.c 17 Jul 2006 11:49:52 -0000 1.24
+++ bitmap.c 26 Oct 2006 19:10:05 -0000 1.25
@@ -55,7 +55,7 @@
*
* On success return 0 and on error return -1 with errno set to the error code.
*/
-static __inline__ int ntfs_bitmap_set_bits_in_run(ntfs_attr *na, s64 start_bit,
+static int ntfs_bitmap_set_bits_in_run(ntfs_attr *na, s64 start_bit,
s64 count, int value)
{
s64 bufsize, br;
Index: compress.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/compress.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- compress.c 31 Oct 2005 01:19:27 -0000 1.15
+++ compress.c 26 Oct 2006 19:10:05 -0000 1.16
@@ -261,7 +261,7 @@ return_overflow:
* code. Might be a bit confusing to debug but there really should never be
* errors coming from here.
*/
-static __inline__ BOOL ntfs_is_cb_compressed(ntfs_attr *na,
+static BOOL ntfs_is_cb_compressed(ntfs_attr *na,
runlist_element *rl, VCN cb_start_vcn, int cb_clusters)
{
/*
Index: device.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/device.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- device.c 24 Feb 2006 15:49:59 -0000 1.29
+++ device.c 26 Oct 2006 19:10:05 -0000 1.30
@@ -469,7 +469,7 @@ s64 ntfs_cluster_write(const ntfs_volume
*
* Return 0 if it is valid and -1 if it is not valid.
*/
-static inline int ntfs_device_offset_valid(struct ntfs_device *dev, s64 ofs)
+static int ntfs_device_offset_valid(struct ntfs_device *dev, s64 ofs)
{
char ch;
Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- dir.c 25 Oct 2006 18:57:15 -0000 1.67
+++ dir.c 26 Oct 2006 19:10:05 -0000 1.68
@@ -629,7 +629,7 @@ typedef enum {
* Pass information specifying the current directory entry @ie to the @filldir
* callback.
*/
-static inline int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
+static int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
const INDEX_TYPE index_type, index_union iu, INDEX_ENTRY *ie,
void *dirent, ntfs_filldir_t filldir)
{
Index: inode.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- inode.c 22 Oct 2006 00:23:29 -0000 1.85
+++ inode.c 26 Oct 2006 19:10:05 -0000 1.86
@@ -57,7 +57,7 @@
*
* Returns:
*/
-static __inline__ ntfs_inode *__ntfs_inode_allocate(ntfs_volume *vol)
+static ntfs_inode *__ntfs_inode_allocate(ntfs_volume *vol)
{
ntfs_inode *ni;
@@ -88,7 +88,7 @@ ntfs_inode *ntfs_inode_allocate(ntfs_vol
*
* Returns:
*/
-static __inline__ int __ntfs_inode_release(ntfs_inode *ni)
+static int __ntfs_inode_release(ntfs_inode *ni)
{
if (NInoDirty(ni))
ntfs_log_debug("Eeek. Discarding dirty inode!\n");
Index: runlist.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- runlist.c 25 Sep 2006 17:03:48 -0000 1.70
+++ runlist.c 26 Oct 2006 19:10:05 -0000 1.71
@@ -100,7 +100,7 @@ static __inline__ void ntfs_rl_mc(runlis
* On success, return a pointer to the newly allocated, or recycled, memory.
* On error, return NULL with errno set to the error code.
*/
-static __inline__ runlist_element *ntfs_rl_realloc(runlist_element *rl,
+static runlist_element *ntfs_rl_realloc(runlist_element *rl,
int old_size, int new_size)
{
old_size = (old_size * sizeof(runlist_element) + 0xfff) & ~0xfff;
@@ -121,7 +121,7 @@ static __inline__ runlist_element *ntfs_
* Return: TRUE Success, the runlists can be merged.
* FALSE Failure, the runlists cannot be merged.
*/
-static __inline__ BOOL ntfs_rl_are_mergeable(runlist_element *dst,
+static BOOL ntfs_rl_are_mergeable(runlist_element *dst,
runlist_element *src)
{
if (!dst || !src) {
@@ -182,7 +182,7 @@ static __inline__ void __ntfs_rl_merge(r
* On error, return NULL, with errno set to the error code. Both runlists are
* left unmodified.
*/
-static __inline__ runlist_element *ntfs_rl_append(runlist_element *dst,
+static runlist_element *ntfs_rl_append(runlist_element *dst,
int dsize, runlist_element *src, int ssize, int loc)
{
BOOL right = FALSE; /* Right end of @src needs merging */
@@ -249,7 +249,7 @@ static __inline__ runlist_element *ntfs_
* On error, return NULL, with errno set to the error code. Both runlists are
* left unmodified.
*/
-static __inline__ runlist_element *ntfs_rl_insert(runlist_element *dst,
+static runlist_element *ntfs_rl_insert(runlist_element *dst,
int dsize, runlist_element *src, int ssize, int loc)
{
BOOL left = FALSE; /* Left end of @src needs merging */
@@ -345,7 +345,7 @@ static __inline__ runlist_element *ntfs_
* On error, return NULL, with errno set to the error code. Both runlists are
* left unmodified.
*/
-static __inline__ runlist_element *ntfs_rl_replace(runlist_element *dst,
+static runlist_element *ntfs_rl_replace(runlist_element *dst,
int dsize, runlist_element *src, int ssize, int loc)
{
signed delta;
@@ -432,7 +432,7 @@ static __inline__ runlist_element *ntfs_
* On error, return NULL, with errno set to the error code. Both runlists are
* left unmodified.
*/
-static __inline__ runlist_element *ntfs_rl_split(runlist_element *dst,
+static runlist_element *ntfs_rl_split(runlist_element *dst,
int dsize, runlist_element *src, int ssize, int loc)
{
if (!dst || !src) {
@@ -1220,7 +1220,7 @@ rl_err_out:
*
* Return the number of bytes written. This function cannot fail.
*/
-__inline__ int ntfs_get_nr_significant_bytes(const s64 n)
+static int ntfs_get_nr_significant_bytes(const s64 n)
{
s64 l = n;
int i;
@@ -1363,7 +1363,7 @@ err_out:
* Return the number of bytes written on success. On error, i.e. the
* destination buffer @dst is too small, return -1 with errno set ENOSPC.
*/
-__inline__ int ntfs_write_significant_bytes(u8 *dst, const u8 *dst_max,
+static int ntfs_write_significant_bytes(u8 *dst, const u8 *dst_max,
const s64 n)
{
s64 l = n;
Index: win32_io.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- win32_io.c 18 Oct 2006 14:44:23 -0000 1.47
+++ win32_io.c 26 Oct 2006 19:10:05 -0000 1.48
@@ -222,7 +222,7 @@ static void ntfs_device_win32_init_impor
*
* Supported flags are O_RDONLY, O_WRONLY and O_RDWR.
*/
-static __inline__ int ntfs_device_unix_status_flags_to_win32(int flags)
+static int ntfs_device_unix_status_flags_to_win32(int flags)
{
int win_mode;
@@ -508,7 +508,7 @@ static int ntfs_device_win32_getgeo(HAND
* Return 0 if o.k.
* -1 if not, and errno set.
*/
-static __inline__ int ntfs_device_win32_open_file(char *filename, win32_fd *fd,
+static int ntfs_device_win32_open_file(char *filename, win32_fd *fd,
int flags)
{
HANDLE handle;
@@ -538,7 +538,7 @@ static __inline__ int ntfs_device_win32_
* return 0 if o.k.
* -1 if not, and errno set.
*/
-static __inline__ int ntfs_device_win32_open_drive(int drive_id, win32_fd *fd,
+static int ntfs_device_win32_open_drive(int drive_id, win32_fd *fd,
int flags)
{
HANDLE handle;
@@ -1360,7 +1360,7 @@ static int ntfs_device_win32_stat(struct
* Return 0 if o.k.
* -1 if not, and errno set. Note if error fd->handle is trashed.
*/
-static __inline__ int ntfs_win32_hdio_getgeo(struct ntfs_device *dev,
+static int ntfs_win32_hdio_getgeo(struct ntfs_device *dev,
struct hd_geometry *argp)
{
win32_fd *fd = (win32_fd *)dev->d_private;
@@ -1382,7 +1382,7 @@ static __inline__ int ntfs_win32_hdio_ge
* Return 0 if o.k.
* -1 if not, and errno set. Note if error fd->handle is trashed.
*/
-static __inline__ int ntfs_win32_blksszget(struct ntfs_device *dev,int *argp)
+static int ntfs_win32_blksszget(struct ntfs_device *dev,int *argp)
{
win32_fd *fd = (win32_fd *)dev->d_private;
DWORD bytesReturned;
|
