Switch to unified view

a/src/internfile/internfile.h b/src/internfile/internfile.h
...
...
27
using std::map;
27
using std::map;
28
using std::set;
28
using std::set;
29
29
30
#include "pathut.h"
30
#include "pathut.h"
31
#include "Filter.h"
31
#include "Filter.h"
32
// Beware: the class changes according to RCL_USE_XATTR, so any file
33
// including this needs autoconfig.h
34
#include "autoconfig.h"
32
35
33
class RclConfig;
36
class RclConfig;
34
namespace Rcl {
37
namespace Rcl {
35
class Doc;
38
class Doc;
36
}
39
}
...
...
132
    string                 m_targetMType;
135
    string                 m_targetMType;
133
    string                 m_reachedMType; // target or text/plain
136
    string                 m_reachedMType; // target or text/plain
134
    // m_tdir and m_tfile are used only for decompressing input file if needed
137
    // m_tdir and m_tfile are used only for decompressing input file if needed
135
    const string&          m_tdir; 
138
    const string&          m_tdir; 
136
    string                 m_tfile;
139
    string                 m_tfile;
140
#ifdef RCL_USE_XATTR
141
    // Fields found in file extended attributes. This is kept here,
142
    // not in the file-level handler because we are only interested in
143
    // the top-level file, not any temp file necessitated by
144
    // processing the internal doc hierarchy.
145
    map<string, string> m_XAttrsFields;
146
#endif // RCL_USE_XATTR
147
137
    // Filter stack, path to the current document from which we're
148
    // Filter stack, path to the current document from which we're
138
    // fetching subdocs
149
    // fetching subdocs
139
    vector<Dijon::Filter*> m_handlers;
150
    vector<Dijon::Filter*> m_handlers;
140
    // Temporary files used for decoding the current stack
151
    // Temporary files used for decoding the current stack
141
    bool                   m_tmpflgs[MAXHANDLERS];
152
    bool                   m_tmpflgs[MAXHANDLERS];
...
...
152
    bool dataToTempFile(const string& data, const string& mt, string& fn);
163
    bool dataToTempFile(const string& data, const string& mt, string& fn);
153
    void popHandler();
164
    void popHandler();
154
    int addHandler();
165
    int addHandler();
155
    void checkExternalMissing(const string& msg, const string& mt);
166
    void checkExternalMissing(const string& msg, const string& mt);
156
    void processNextDocError(Rcl::Doc &doc, string& ipath);
167
    void processNextDocError(Rcl::Doc &doc, string& ipath);
168
#ifdef RCL_USE_XATTR
169
    void reapXAttrs(const string& fn);
170
#endif
157
};
171
};
158
172
159
 
173
 
160
#endif /* _INTERNFILE_H_INCLUDED_ */
174
#endif /* _INTERNFILE_H_INCLUDED_ */