Commit 4b2d9eb0da287e59f146f3b8cfe1be28d3f33397
1 parent
b290c2eb
fix some names and adapt to fixed PARENTCALL
Showing
12 changed files
with
16 additions
and
15 deletions
... | ... | @@ -37,7 +37,7 @@ commManagerCtor(void * _this, va_list * params) |
37 | 37 | { |
38 | 38 | TR_CommManager this = _this; |
39 | 39 | |
40 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | |
40 | + TR_PARENTCALL(TR_CommManager, _this, TR_Class, ctor, params); | |
41 | 41 | |
42 | 42 | this->n_endpoints = sysconf(_SC_OPEN_MAX); |
43 | 43 | this->endpoints = TR_calloc(sizeof(TR_CommEndPoint), this->n_endpoints); | ... | ... |
... | ... | @@ -41,7 +41,7 @@ commManagerPollCtor(void * _this, va_list * params) |
41 | 41 | TR_CommManager cmgr = _this; |
42 | 42 | nfds_t i; |
43 | 43 | |
44 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | |
44 | + TR_PARENTCALL(TR_CommManagerPoll, _this, TR_Class, ctor, params); | |
45 | 45 | this->fds = TR_malloc(sizeof(struct pollfd) * cmgr->n_endpoints); |
46 | 46 | for (i = 0; i < cmgr->n_endpoints; i++) { |
47 | 47 | this->fds[i].fd = -1; |
... | ... | @@ -59,7 +59,7 @@ commManagerPollDtor(void * _this) |
59 | 59 | TR_CommManagerPoll this = _this; |
60 | 60 | |
61 | 61 | TR_MEM_FREE(this->fds); |
62 | - TR_PARENTCALL(_this, TR_Class, dtor); | |
62 | + TR_PARENTCALL(TR_CommManagerPoll, _this, TR_Class, dtor); | |
63 | 63 | } |
64 | 64 | |
65 | 65 | static | ... | ... |
... | ... | @@ -36,7 +36,7 @@ static |
36 | 36 | int |
37 | 37 | connEntryPointCtor(void * _this, va_list * params) |
38 | 38 | { |
39 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | |
39 | + TR_PARENTCALL(TR_ConnEntryPoint, _this, TR_Class, ctor, params); | |
40 | 40 | return 0; |
41 | 41 | } |
42 | 42 | |
... | ... | @@ -44,7 +44,7 @@ static |
44 | 44 | void |
45 | 45 | connEntryPointDtor(void * _this) |
46 | 46 | { |
47 | - TR_PARENTCALL(_this, TR_Class, dtor); | |
47 | + TR_PARENTCALL(TR_ConnEntryPoint, _this, TR_Class, dtor); | |
48 | 48 | } |
49 | 49 | |
50 | 50 | static | ... | ... |
... | ... | @@ -39,7 +39,7 @@ connectionCtor(void * _this, va_list * params) |
39 | 39 | { |
40 | 40 | TR_Connection this = _this; |
41 | 41 | |
42 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | |
42 | + TR_PARENTCALL(TR_Connection, _this, TR_Class, ctor, params); | |
43 | 43 | this->current_message = NULL; |
44 | 44 | |
45 | 45 | return 0; |
... | ... | @@ -52,7 +52,7 @@ connectionDtor(void * _this) |
52 | 52 | TR_Connection this = _this; |
53 | 53 | |
54 | 54 | TR_delete(this->current_message); |
55 | - TR_PARENTCALL(_this, TR_Class, dtor); | |
55 | + TR_PARENTCALL(TR_Connection, _this, TR_Class, dtor); | |
56 | 56 | } |
57 | 57 | |
58 | 58 | static | ... | ... |
... | ... | @@ -37,7 +37,7 @@ static |
37 | 37 | int |
38 | 38 | connectorCtor(void * _this, va_list * params) |
39 | 39 | { |
40 | - TR_PARENTCALL(_this, TR_Class, ctor, params); | |
40 | + TR_PARENTCALL(TR_Connector, _this, TR_Class, ctor, params); | |
41 | 41 | return 0; |
42 | 42 | } |
43 | 43 | |
... | ... | @@ -45,7 +45,7 @@ static |
45 | 45 | void |
46 | 46 | connectorDtor(void * _this) |
47 | 47 | { |
48 | - TR_PARENTCALL(_this, TR_Class, dtor); | |
48 | + TR_PARENTCALL(TR_Connector, _this, TR_Class, dtor); | |
49 | 49 | } |
50 | 50 | |
51 | 51 | static | ... | ... |
Please
register
or
login
to post a comment