io: directory: convert to new object system
This commit is contained in:
@@ -1,16 +1,25 @@
|
||||
#ifndef BLUELIB_IO_DIRECTORY_H_
|
||||
#define BLUELIB_IO_DIRECTORY_H_
|
||||
#ifndef BLUE_IO_DIRECTORY_H_
|
||||
#define BLUE_IO_DIRECTORY_H_
|
||||
|
||||
#include <blue/core/error.h>
|
||||
#include <blue/core/iterator.h>
|
||||
#include <blue/core/macros.h>
|
||||
#include <blue/core/misc.h>
|
||||
#include <blue/io/file.h>
|
||||
#include <blue/io/path.h>
|
||||
|
||||
#define B_DIRECTORY(p) ((b_directory *)(p))
|
||||
#define B_DIRECTORY_ROOT ((b_directory *)NULL)
|
||||
|
||||
typedef struct b_directory b_directory;
|
||||
B_DECLS_BEGIN;
|
||||
|
||||
struct b_directory_p;
|
||||
|
||||
#define B_TYPE_DIRECTORY (b_directory_get_type())
|
||||
|
||||
B_DECLARE_TYPE(b_directory);
|
||||
|
||||
B_TYPE_CLASS_DECLARATION_BEGIN(b_directory)
|
||||
B_TYPE_CLASS_DECLARATION_END(b_directory)
|
||||
|
||||
struct z__b_directory_iterator;
|
||||
|
||||
@@ -28,6 +37,7 @@ typedef enum b_directory_open_flags {
|
||||
typedef struct b_directory_iterator {
|
||||
b_iterator _base;
|
||||
struct z__b_directory_iterator *_z;
|
||||
struct b_directory_p *_p;
|
||||
|
||||
b_directory_iterator_flags flags;
|
||||
b_directory *root;
|
||||
@@ -41,6 +51,8 @@ typedef struct b_directory_iterator {
|
||||
for (int z__b_unique_name() = b_directory_iterator_begin(dir, it, flags); \
|
||||
b_directory_iterator_is_valid(it); b_directory_iterator_next(it))
|
||||
|
||||
BLUE_API b_type b_directory_get_type(void);
|
||||
|
||||
BLUE_API b_result b_directory_open(
|
||||
b_directory *root, const b_path *path, b_directory_open_flags flags,
|
||||
b_directory **out);
|
||||
@@ -67,14 +79,6 @@ BLUE_API bool b_directory_iterator_next(b_directory_iterator *it);
|
||||
BLUE_API b_status b_directory_iterator_erase(b_directory_iterator *it);
|
||||
BLUE_API bool b_directory_iterator_is_valid(const b_directory_iterator *it);
|
||||
|
||||
static inline b_directory *b_directory_retain(b_directory *dir)
|
||||
{
|
||||
return B_DIRECTORY(b_retain(B_DSREF(dir)));
|
||||
}
|
||||
|
||||
static inline void b_directory_release(b_directory *dir)
|
||||
{
|
||||
b_release(B_DSREF(dir));
|
||||
}
|
||||
B_DECLS_END;
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user