merchant

commit c1a9e2217077171af7852bac02ad6e16b6e8e693
parent c257559c7773b214aa4930ac861846105ee2f469
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 22 Jul 2021 19:20:56 +0200

-simplify

Diffstat:
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -1917,7 +1917,6 @@ lookup_deposits_cb (void *cls,
       ldc->qs = GNUNET_DB_STATUS_HARD_ERROR;
       return;
     }
-    ldc->qs = i + 1;
     ldc->cb (ldc->cb_cls,
              exchange_url,
              &coin_pub,
@@ -1927,6 +1926,7 @@ lookup_deposits_cb (void *cls,
              &wire_fee);
     GNUNET_PQ_cleanup_result (rs);
   }
+  ldc->qs = num_results;
 }
 
 
@@ -2488,7 +2488,6 @@ lookup_deposits_by_order_cb (void *cls,
       ldoc->qs = GNUNET_DB_STATUS_HARD_ERROR;
       return;
     }
-    ldoc->qs = i + 1;
     ldoc->cb (ldoc->cb_cls,
               deposit_serial,
               exchange_url,
@@ -2498,6 +2497,7 @@ lookup_deposits_by_order_cb (void *cls,
               &coin_pub);
     GNUNET_PQ_cleanup_result (rs); /* technically useless here */
   }
+  ldoc->qs = num_results;
 }
 
 
@@ -2619,7 +2619,6 @@ lookup_transfer_details_by_order_cb (void *cls,
       ltdo->qs = GNUNET_DB_STATUS_HARD_ERROR;
       return;
     }
-    ltdo->qs = i + 1;
     ltdo->cb (ltdo->cb_cls,
               &wtid,
               exchange_url,
@@ -2629,6 +2628,7 @@ lookup_transfer_details_by_order_cb (void *cls,
               (0 != transfer_confirmed));
     GNUNET_PQ_cleanup_result (rs); /* technically useless here */
   }
+  ltdo->qs = num_results;
 }
 
 
@@ -3256,7 +3256,6 @@ lookup_refunds_detailed_cb (void *cls,
       lrdc->qs = GNUNET_DB_STATUS_HARD_ERROR;
       return;
     }
-    lrdc->qs = i + 1;
     lrdc->rc (lrdc->rc_cls,
               refund_serial,
               timestamp,
@@ -3268,6 +3267,7 @@ lookup_refunds_detailed_cb (void *cls,
               0 != pending8);
     GNUNET_PQ_cleanup_result (rs);
   }
+  lrdc->qs = num_results;
 }
 
 
@@ -3904,7 +3904,6 @@ lookup_deposits_by_contract_and_coin_cb (void *cls,
       ldcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
       return;
     }
-    ldcc->qs = i + 1;
     ldcc->cb (ldcc->cb_cls,
               exchange_url,
               &amount_with_fee,
@@ -3918,6 +3917,7 @@ lookup_deposits_by_contract_and_coin_cb (void *cls,
               &exchange_pub);
     GNUNET_PQ_cleanup_result (rs);
   }
+  ldcc->qs = num_results;
 }
 
 
@@ -4159,13 +4159,13 @@ lookup_transfer_summary_cb (void *cls,
       ltdc->qs = GNUNET_DB_STATUS_HARD_ERROR;
       return;
     }
-    ltdc->qs = i + 1;
     ltdc->cb (ltdc->cb_cls,
               order_id,
               &deposit_value,
               &deposit_fee);
     GNUNET_PQ_cleanup_result (rs);
   }
+  ltdc->qs = num_results;
 }
 
 
@@ -4283,12 +4283,12 @@ lookup_transfer_details_cb (void *cls,
       ltdc->qs = GNUNET_DB_STATUS_HARD_ERROR;
       return;
     }
-    ltdc->qs = i + 1;
     ltdc->cb (ltdc->cb_cls,
               (unsigned int) current_offset,
               &ttd);
     GNUNET_PQ_cleanup_result (rs);
   }
+  ltdc->qs = num_results;
 }
 
 
@@ -4431,7 +4431,6 @@ lookup_transfers_cb (void *cls,
     if ( (ltc->verified == TALER_EXCHANGE_YNA_ALL) ||
          (ltc->verified == verified) )
     {
-      ltc->qs = i + 1;
       ltc->cb (ltc->cb_cls,
                &credit_amount,
                &wtid,
@@ -4444,6 +4443,7 @@ lookup_transfers_cb (void *cls,
     }
     GNUNET_PQ_cleanup_result (rs);
   }
+  ltc->qs = num_results;
 }