stuff changed for compliance
This commit is contained in:
parent
8d91ec55b8
commit
043569d0cb
|
@ -13,12 +13,12 @@ class DynamicObjects
|
|||
public:
|
||||
std::string render_object_list();
|
||||
std::string cleanpath(const char * const);
|
||||
DynamicObjects(Routerin * merouterin) : _merouterin(merouterin){ };
|
||||
DynamicObjects(Routerin * merouterin) : m_merouterin(merouterin){ };
|
||||
~DynamicObjects() {};
|
||||
|
||||
private:
|
||||
std::string _cleanpath (const char * const path);
|
||||
std::map<unsigned int, Sicobject *> _themap;
|
||||
const Routerin * _merouterin;
|
||||
std::map<unsigned int, Sicobject *> m_themap;
|
||||
const Routerin * m_merouterin;
|
||||
|
||||
};
|
||||
|
|
|
@ -17,24 +17,27 @@ class Sicobject
|
|||
Sicobject() = delete;
|
||||
|
||||
Sicobject(const Routerin * master) :
|
||||
_routerin(master),
|
||||
_isvalid(false)
|
||||
{
|
||||
};
|
||||
|
||||
Sicobject(const Routerin *master, unsigned int idnum, std::string fname,size_t objsize,time_t upl_date) :
|
||||
_size(objsize),
|
||||
_idnum(idnum),
|
||||
_routerin(master),
|
||||
_isvalid(true),
|
||||
_upl_date(upl_date),
|
||||
_fname(fname)
|
||||
{
|
||||
}
|
||||
m_routerin(master),
|
||||
m_isvalid(false)
|
||||
{ }
|
||||
|
||||
Sicobject(const Routerin *master,
|
||||
unsigned int idnum,
|
||||
std::string fname,
|
||||
size_t objsize,
|
||||
time_t upl_date) :
|
||||
m_size(objsize),
|
||||
m_idnum(idnum),
|
||||
m_routerin(master),
|
||||
m_isvalid(true),
|
||||
m_upl_date(upl_date),
|
||||
m_fname(fname)
|
||||
{ }
|
||||
|
||||
~Sicobject();
|
||||
std::string get_loadurl(){
|
||||
|
||||
std::string get_loadurl()
|
||||
{
|
||||
std::string retval = "files/"; //TODO add master.get_baseurl()
|
||||
//TODO: add idnum
|
||||
return retval;
|
||||
|
@ -42,16 +45,16 @@ class Sicobject
|
|||
|
||||
std::string get_fname()
|
||||
{
|
||||
return _fname;
|
||||
return m_fname;
|
||||
}
|
||||
|
||||
size_t get_size() { return _size;}
|
||||
size_t get_size() { return m_size;}
|
||||
|
||||
std::string bytesize_string()
|
||||
{
|
||||
std::ostringstream strm( std::ios_base::ate);
|
||||
int i = 0;
|
||||
size_t size = _size;
|
||||
size_t size = m_size;
|
||||
const char* units[] = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
|
||||
while (size > 1024) {
|
||||
size /= 1024;
|
||||
|
@ -65,10 +68,10 @@ class Sicobject
|
|||
|
||||
|
||||
private:
|
||||
size_t _size;
|
||||
unsigned int _idnum;
|
||||
const Routerin * _routerin;
|
||||
bool _isvalid;
|
||||
time_t _upl_date;
|
||||
std::string _fname;
|
||||
size_t m_size;
|
||||
unsigned int m_idnum;
|
||||
const Routerin * m_routerin;
|
||||
bool m_isvalid;
|
||||
time_t m_upl_date;
|
||||
std::string m_fname;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue