directory: moved dirvec struct declaration to dirvec.h
No idea why it was created in directory.h, but it should be in dirvec.h.
This commit is contained in:
parent
a0c044df11
commit
68f716a28b
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#include "directory.h"
|
#include "directory.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "dirvec.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#ifndef DIRECTORY_H
|
#ifndef DIRECTORY_H
|
||||||
#define DIRECTORY_H
|
#define DIRECTORY_H
|
||||||
|
|
||||||
|
#include "dirvec.h"
|
||||||
#include "songvec.h"
|
#include "songvec.h"
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
@ -33,11 +34,6 @@
|
|||||||
#define DIRECTORY_MPD_VERSION "mpd_version: "
|
#define DIRECTORY_MPD_VERSION "mpd_version: "
|
||||||
#define DIRECTORY_FS_CHARSET "fs_charset: "
|
#define DIRECTORY_FS_CHARSET "fs_charset: "
|
||||||
|
|
||||||
struct dirvec {
|
|
||||||
struct directory **base;
|
|
||||||
size_t nr;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct directory {
|
struct directory {
|
||||||
char *path;
|
char *path;
|
||||||
struct dirvec children;
|
struct dirvec children;
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
#include "directory.h"
|
#include "directory.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "song_print.h"
|
#include "song_print.h"
|
||||||
#include "dirvec.h"
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
dirvec_print(struct client *client, const struct dirvec *dv)
|
dirvec_print(struct client *client, const struct dirvec *dv)
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
#include "path.h"
|
#include "path.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "song_save.h"
|
#include "song_save.h"
|
||||||
#include "dirvec.h"
|
|
||||||
|
|
||||||
/* TODO error checking */
|
/* TODO error checking */
|
||||||
int
|
int
|
||||||
|
@ -1,7 +1,12 @@
|
|||||||
#ifndef DIRVEC_H
|
#ifndef DIRVEC_H
|
||||||
#define DIRVEC_H
|
#define DIRVEC_H
|
||||||
|
|
||||||
struct dirvec;
|
#include <stddef.h>
|
||||||
|
|
||||||
|
struct dirvec {
|
||||||
|
struct directory **base;
|
||||||
|
size_t nr;
|
||||||
|
};
|
||||||
|
|
||||||
void dirvec_sort(struct dirvec *dv);
|
void dirvec_sort(struct dirvec *dv);
|
||||||
|
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#include "playlist.h"
|
#include "playlist.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "main_notify.h"
|
#include "main_notify.h"
|
||||||
#include "dirvec.h"
|
|
||||||
#include "condition.h"
|
#include "condition.h"
|
||||||
#include "update.h"
|
#include "update.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user