package/pound/0002-fix-openssl-1.1.0.patch

132 @@ -58,7 +65,9 @@ t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const
138 +    if((old = lh_TABNODE_insert(tab, t)) != NULL) {
140      if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
142      if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
143 @@ -82,7 +91,9 @@ t_find(LHASH_OF(TABNODE) *const tab, char *const key)
149 +    if((res = lh_TABNODE_retrieve(tab, &t)) != NULL) {
151      if((res = (TABNODE *)LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
153      if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
154 @@ -102,7 +113,9 @@ t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
160 +    if((res = lh_TABNODE_delete(tab, &t)) != NULL) {
162      if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
164      if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
171 +        if((res = lh_TABNODE_delete(a->tab, t)) != NULL) {
173          if((res = LHM_lh_delete(TABNODE, a->tab, t)) != NULL) {
175          if((res = lh_delete(a->tab, t)) != NULL) {
187 @@ -156,14 +175,16 @@ t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
189      a.tab = tab;
191 -    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
192 -    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
194 +    down_load = TABNODE_GET_DOWN_LOAD(tab);
195 +    TABNODE_SET_DOWN_LOAD(tab, 0);
197 +    lh_TABNODE_doall_ALL_ARG(tab, t_old_doall_arg, &a);
199      LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
201      lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
203 -    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
204 +    TABNODE_SET_DOWN_LOAD(tab, down_load);
214 +        if((res = lh_TABNODE_delete(arg->tab, t)) != NULL) {
216          if((res = LHM_lh_delete(TABNODE, arg->tab, t)) != NULL) {
218          if((res = lh_delete(arg->tab, t)) != NULL) {
219 @@ -203,15 +226,16 @@ t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_…
220      a.tab = tab;
223 -    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
224 -    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
226 +    down_load = TABNODE_GET_DOWN_LOAD(tab);
227 +    TABNODE_SET_DOWN_LOAD(tab, 0);
229 +    lh_TABNODE_doall_ALL_ARG(tab, t_cont_doall_arg, &a);
231      LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
233      lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
235 -    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
237 +    TABNODE_SET_DOWN_LOAD(tab, down_load);