… | |
… | |
28 | */ |
28 | */ |
29 | |
29 | |
30 | objectlink * |
30 | objectlink * |
31 | get_objectlink (void) |
31 | get_objectlink (void) |
32 | { |
32 | { |
33 | objectlink *ol = (objectlink *) CALLOC (1, sizeof (objectlink)); |
33 | objectlink *ol = new objectlink; |
34 | |
34 | |
35 | ol->ob = NULL; |
35 | ol->ob = 0; |
36 | ol->next = NULL; |
36 | ol->next = 0; |
37 | ol->id = 0; |
|
|
38 | return ol; |
37 | return ol; |
39 | } |
38 | } |
40 | |
39 | |
41 | /* |
40 | /* |
42 | * Allocates a new oblinkpt structure, initialises it, and returns |
41 | * Allocates a new oblinkpt structure, initialises it, and returns |
… | |
… | |
44 | */ |
43 | */ |
45 | |
44 | |
46 | oblinkpt * |
45 | oblinkpt * |
47 | get_objectlinkpt (void) |
46 | get_objectlinkpt (void) |
48 | { |
47 | { |
49 | oblinkpt *obp = (oblinkpt *) malloc (sizeof (oblinkpt)); |
48 | oblinkpt *obp = new oblinkpt; |
50 | |
49 | |
51 | obp->link = NULL; |
50 | obp->link = 0; |
52 | obp->next = NULL; |
51 | obp->next = 0; |
53 | obp->value = 0; |
52 | obp->value = 0; |
54 | return obp; |
53 | return obp; |
55 | } |
54 | } |
56 | |
55 | |
57 | /* |
56 | /* |
… | |
… | |
61 | void |
60 | void |
62 | free_objectlink (objectlink * ol) |
61 | free_objectlink (objectlink * ol) |
63 | { |
62 | { |
64 | if (ol->next) |
63 | if (ol->next) |
65 | free_objectlink (ol->next); |
64 | free_objectlink (ol->next); |
66 | free (ol); |
65 | |
|
|
66 | delete ol; |
67 | } |
67 | } |
68 | |
68 | |
69 | /* |
69 | /* |
70 | * Recursively frees all linked list of objectlink pointers |
70 | * Recursively frees all linked list of objectlink pointers |
71 | */ |
71 | */ |
72 | |
72 | |
73 | void |
73 | void |
74 | free_objectlinkpt (oblinkpt * obp) |
74 | free_objectlinkpt (oblinkpt *obp) |
75 | { |
75 | { |
76 | if (obp->next) |
76 | if (obp->next) |
77 | free_objectlinkpt (obp->next); |
77 | free_objectlinkpt (obp->next); |
|
|
78 | |
78 | if (obp->link) |
79 | if (obp->link) |
79 | free_objectlink (obp->link); |
80 | free_objectlink (obp->link); |
80 | free (obp); |
81 | |
|
|
82 | delete obp; |
81 | } |
83 | } |