Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
jcr: cleanup forward declarations
  • Loading branch information
franku committed Nov 7, 2019
1 parent fbc128b commit 2de0649
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 18 deletions.
4 changes: 4 additions & 0 deletions core/src/filed/jcr_private.h
Expand Up @@ -29,6 +29,10 @@
struct acl_data_t;
struct xattr_data_t;

namespace filedaemon {
class BareosAccurateFilelist;
}

/* clang-format off */
struct CryptoContext {
bool pki_sign = false; /**< Enable PKI Signatures? */
Expand Down
2 changes: 2 additions & 0 deletions core/src/findlib/match.h
Expand Up @@ -21,6 +21,8 @@
#ifndef BAREOS_FINDLIB_MATCH_H_
#define BAREOS_FINDLIB_MATCH_H_

struct FindFilesPacket;

void InitIncludeExcludeFiles(FindFilesPacket* ff);
void TermIncludeExcludeFiles(FindFilesPacket* ff);
void AddFnameToIncludeList(FindFilesPacket* ff,
Expand Down
21 changes: 3 additions & 18 deletions core/src/include/jcr.h
Expand Up @@ -48,11 +48,6 @@ typedef struct s_tree_root TREE_ROOT;

class dlist;

namespace filedaemon {
class BareosAccurateFilelist;
struct save_pkt;
} // namespace filedaemon

/**
* Backup/Verify level code. These are stored in the DB
*/
Expand Down Expand Up @@ -179,19 +174,12 @@ enum

#define endeach_jcr(jcr) JcrWalkEnd(jcr)

#define SD_APPEND 1
#define SD_READ 0

/**
* Forward referenced structures
*/
class JobControlRecord;
class BareosSocket;
class BareosDb;
class htable;

struct AttributesDbRecord;
struct FindFilesPacket;
struct bpContext;
#ifdef HAVE_WIN32
struct CopyThreadContext;
Expand Down Expand Up @@ -232,7 +220,7 @@ class JobControlRecord {
int32_t JobType_ = 0; /**< Backup, restore, verify ... */
int32_t JobLevel_ = 0; /**< Job level */
int32_t Protocol_ = 0; /**< Backup Protocol */
bool my_thread_killable = false; /**< Can we kill the thread? */
bool my_thread_killable = false;
public:
JobControlRecord();
~JobControlRecord();
Expand Down Expand Up @@ -291,11 +279,8 @@ class JobControlRecord {
void SetKillable(bool killable); /**< in lib/jcr.c */
bool IsKillable() const { return my_thread_killable; }

/*
* Global part of JobControlRecord common to all daemons
*/
dlink link; /**< JobControlRecord chain link */
pthread_t my_thread_id = 0; /**< Id of thread controlling jcr */
dlink link; /**< JobControlRecord chain link */
pthread_t my_thread_id = 0; /**< Id of thread controlling jcr */
BareosSocket* dir_bsock = nullptr; /**< Director bsock or NULL if we are him */
BareosSocket* store_bsock = nullptr; /**< Storage connection socket */
BareosSocket* file_bsock; /**< File daemon connection socket */
Expand Down
3 changes: 3 additions & 0 deletions core/src/stored/jcr_private.h
Expand Up @@ -26,6 +26,9 @@

#include "stored/read_ctx.h"

#define SD_APPEND 1
#define SD_READ 0

namespace storagedaemon {
struct VolumeList;
class DeviceControlRecord;
Expand Down

0 comments on commit 2de0649

Please sign in to comment.