Changeset 76ca3f7 in mainline for uspace/srv/fs


Ignore:
Timestamp:
2010-03-23T20:49:54Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e417b96
Parents:
b48ebd19 (diff), 63f8966 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mailnline changes, revision 329

Location:
uspace/srv/fs
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/fs/devfs/Makefile

    rb48ebd19 r76ca3f7  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBFS_PREFIX)/libfs.a
    3232EXTRA_CFLAGS += -I$(LIBFS_PREFIX)
    33 
    34 OUTPUT = devfs
     33BINARY = devfs
    3534
    3635SOURCES = \
    … …  
    3837        devfs_ops.c
    3938
    40 include ../../Makefile.common
     39include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/fs/devfs/devfs_ops.c

    rb48ebd19 r76ca3f7  
    4141#include <errno.h>
    4242#include <malloc.h>
    43 #include <string.h>
     43#include <str.h>
    4444#include <libfs.h>
    4545#include <fibril_synch.h>

  • uspace/srv/fs/fat/Makefile

    rb48ebd19 r76ca3f7  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    3232EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
    33 
    34 OUTPUT = fat
     33BINARY = fat
    3534
    3635SOURCES = \
    … …  
    4140        fat_fat.c
    4241
    43 include ../../Makefile.common
     42include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/fs/fat/fat_dentry.c

    rb48ebd19 r76ca3f7  
    3838#include "fat_dentry.h"
    3939#include <ctype.h>
    40 #include <string.h>
     40#include <str.h>
    4141
    4242static bool is_d_char(const char ch)

  • uspace/srv/fs/fat/fat_idx.c

    rb48ebd19 r76ca3f7  
    3939#include "../../vfs/vfs.h"
    4040#include <errno.h>
    41 #include <string.h>
     41#include <str.h>
    4242#include <adt/hash_table.h>
    4343#include <adt/list.h>

  • uspace/srv/fs/fat/fat_ops.c

    rb48ebd19 r76ca3f7  
    4848#include <async.h>
    4949#include <errno.h>
    50 #include <string.h>
     50#include <str.h>
    5151#include <byteorder.h>
    5252#include <adt/hash_table.h>

  • uspace/srv/fs/tmpfs/Makefile

    rb48ebd19 r76ca3f7  
    2929
    3030USPACE_PREFIX = ../../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a $(LIBC_PREFIX)/libc.a
     31LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBFS_PREFIX)/libfs.a
    3232EXTRA_CFLAGS += -I$(LIBBLOCK_PREFIX) -I$(LIBFS_PREFIX)
    33 
    34 OUTPUT = tmpfs
     33BINARY = tmpfs
    3534
    3635SOURCES = \
    … …  
    3938        tmpfs_dump.c
    4039
    41 include ../../Makefile.common
     40include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/fs/tmpfs/tmpfs_dump.c

    rb48ebd19 r76ca3f7  
    4141#include <errno.h>
    4242#include <stdlib.h>
    43 #include <string.h>
     43#include <str.h>
    4444#include <sys/types.h>
    4545#include <as.h>

  • uspace/srv/fs/tmpfs/tmpfs_ops.c

    rb48ebd19 r76ca3f7  
    4646#include <atomic.h>
    4747#include <stdlib.h>
    48 #include <string.h>
     48#include <str.h>
    4949#include <stdio.h>
    5050#include <assert.h>
Note: See TracChangeset for help on using the changeset viewer.