Switch to unified view

a/src/common/rclconfig.h b/src/common/rclconfig.h
...
...
255
    /** Thread config init is not done automatically because not all
255
    /** Thread config init is not done automatically because not all
256
    programs need it and it uses debuglog so that it's better to
256
    programs need it and it uses debuglog so that it's better to
257
    call it after primary init */
257
    call it after primary init */
258
    void initThrConf();
258
    void initThrConf();
259
259
260
    const string& getOrigCwd() 
261
    {
262
  return o_origcwd;
263
    }
264
260
    ~RclConfig() {
265
    ~RclConfig() {
261
    freeAll();
266
    freeAll();
262
    }
267
    }
263
268
264
    RclConfig(const RclConfig &r) {
269
    RclConfig(const RclConfig &r) {
...
...
300
    ParamStale   m_stpsuffstate;
305
    ParamStale   m_stpsuffstate;
301
306
302
    ParamStale   m_skpnstate;
307
    ParamStale   m_skpnstate;
303
    vector<string> m_skpnlist;
308
    vector<string> m_skpnlist;
304
309
310
    // Original current working directory. Set once at init before we do any
311
    // chdir'ing and used for converting user args to absolute paths.
312
    static string o_origcwd;
313
305
    // Parameters auto-fetched on setkeydir
314
    // Parameters auto-fetched on setkeydir
306
    string m_defcharset;
315
    string m_defcharset;
307
    static string o_localecharset;
316
    static string o_localecharset;
308
    // Limiting set of mime types to be processed. Normally empty.
317
    // Limiting set of mime types to be processed. Normally empty.
309
    ParamStale    m_rmtstate;
318
    ParamStale    m_rmtstate;