renepay: remove __PRETTY_FUNCTION__

Remove __PRETTY_FUNCTION__ in favor of __func__

Signed-off-by: Lagrang3 <[email protected]>

Author: Lagrang3

plugins/renepay/main.c

@@ -89,7 +89,7 @@ static const char *init(struct plugin *p,
 		plugin_log(pay_plugin->plugin, LOG_UNUSUAL,
 			   "%s: uncertainty was updated but %d channels have "
 			   "been ignored.",
-			   __PRETTY_FUNCTION__, skipped_count);
+			   __func__, skipped_count);
 
 	plugin_set_memleak_handler(p, memleak_mark);
 	return NULL;

plugins/renepay/mcf.c

@@ -1193,7 +1193,7 @@ static u32 find_positive_balance(
 	 * algorithm does not come up with spurious flow cycles. */
 	while(balance[final_idx]<=0)
 	{
-		// printf("%s: node = %d\n",__PRETTY_FUNCTION__,final_idx);
+		// printf("%s: node = %d\n",__func__,final_idx);
 		u32 updated_idx=INVALID_INDEX;
 		struct gossmap_node *cur
 			= gossmap_node_byidx(gossmap,final_idx);

plugins/renepay/mods.c

@@ -129,13 +129,13 @@ static bool success_data_from_listsendpays(const char *buf,
 			plugin_err(
 			    pay_plugin->plugin,
 			    "%s (line %d) missing status token from json.",
-			    __PRETTY_FUNCTION__, __LINE__);
+			    __func__, __LINE__);
 		const char *status = json_strdup(tmpctx, buf, status_tok);
 		if (!status)
 			plugin_err(
 			    pay_plugin->plugin,
 			    "%s (line %d) failed to allocate status string.",
-			    __PRETTY_FUNCTION__, __LINE__);
+			    __func__, __LINE__);
 
 		if (streq(status, "complete")) {
 			/* FIXME we assume amount_msat is always present, but
@@ -160,7 +160,7 @@ static bool success_data_from_listsendpays(const char *buf,
 					   "%s (line %d) json_scan of "
 					   "listsendpay returns the "
 					   "following error: %s",
-					   __PRETTY_FUNCTION__, __LINE__, err);
+					   __func__, __LINE__, err);
 			success->groupid = groupid;
 			/* Now we know the payment completed. */
 			if (!amount_msat_add(&success->deliver_msat,
@@ -170,7 +170,7 @@ static bool success_data_from_listsendpays(const char *buf,
 					     success->sent_msat, this_sent))
 				plugin_err(pay_plugin->plugin,
 					   "%s (line %d) amount_msat overflow.",
-					   __PRETTY_FUNCTION__, __LINE__);
+					   __func__, __LINE__);
 
 			success->parts++;
 		}
@@ -482,7 +482,7 @@ static struct command_result *refreshgossmap_cb(struct payment *payment)
 			    pay_plugin->plugin, LOG_UNUSUAL,
 			    "%s: uncertainty was updated but %d channels have "
 			    "been ignored.",
-			    __PRETTY_FUNCTION__, skipped_count);
+			    __func__, skipped_count);
 	}
 	return payment_continue(payment);
 }
@@ -597,7 +597,7 @@ static struct command_result *routehints_done(struct command *cmd UNUSED,
 		plugin_log(pay_plugin->plugin, LOG_UNUSUAL,
 			   "%s: uncertainty was updated but %d channels have "
 			   "been ignored.",
-			   __PRETTY_FUNCTION__, skipped_count);
+			   __func__, skipped_count);
 
 	return payment_continue(payment);
 }
@@ -631,22 +631,22 @@ static struct command_result *compute_routes_cb(struct payment *payment)
 	    tal_count(routetracker->computed_routes))
 		plugin_err(pay_plugin->plugin,
 			   "%s: no previously computed routes expected.",
-			   __PRETTY_FUNCTION__);
+			   __func__);
 
 	struct amount_msat feebudget, fees_spent, remaining;
 
 	/* Total feebudget  */
 	if (!amount_msat_sub(&feebudget, payment->payment_info.maxspend,
 			     payment->payment_info.amount))
 		plugin_err(pay_plugin->plugin, "%s: fee budget is negative?",
-			   __PRETTY_FUNCTION__);
+			   __func__);
 
 	/* Fees spent so far */
 	if (!amount_msat_sub(&fees_spent, payment->total_sent,
 			     payment->total_delivering))
 		plugin_err(pay_plugin->plugin,
 			   "%s: total_delivering is greater than total_sent?",
-			   __PRETTY_FUNCTION__);
+			   __func__);
 
 	/* Remaining fee budget. */
 	if (!amount_msat_sub(&feebudget, feebudget, fees_spent))
@@ -658,7 +658,7 @@ static struct command_result *compute_routes_cb(struct payment *payment)
 		plugin_log(pay_plugin->plugin, LOG_UNUSUAL,
 			   "%s: Payment is pending with full amount already "
 			   "committed. We skip the computation of new routes.",
-			   __PRETTY_FUNCTION__);
+			   __func__);
 		return payment_continue(payment);
 	}
 
@@ -724,7 +724,7 @@ static struct command_result *send_routes_cb(struct payment *payment)
 	    tal_count(routetracker->computed_routes) == 0) {
 		plugin_log(pay_plugin->plugin, LOG_UNUSUAL,
 			   "%s: there are no routes to send, skipping.",
-			   __PRETTY_FUNCTION__);
+			   __func__);
 		return payment_continue(payment);
 	}
 	struct command *cmd = payment_command(payment);
@@ -806,7 +806,7 @@ static struct command_result *collect_results_cb(struct payment *payment)
 			    "%s: received a success sendpay for this "
 			    "payment but the total delivering amount %s "
 			    "is less than the payment amount %s.",
-			    __PRETTY_FUNCTION__,
+			    __func__,
 			    fmt_amount_msat(tmpctx, payment->total_delivering),
 			    fmt_amount_msat(tmpctx,
 					    payment->payment_info.amount));
@@ -930,7 +930,7 @@ static struct command_result *pendingsendpays_done(struct command *cmd,
 		payment_note(payment, LOG_DBG,
 			     "%s: Payment completed before computing the next "
 			     "round of routes.",
-			     __PRETTY_FUNCTION__);
+			     __func__);
 		return payment_success(payment, &success.preimage);
 	}
 
@@ -950,7 +950,7 @@ static struct command_result *pendingsendpays_done(struct command *cmd,
 			plugin_err(pay_plugin->plugin,
 				   "%s json_scan of listsendpay returns the "
 				   "following error: %s",
-				   __PRETTY_FUNCTION__, err);
+				   __func__, err);
 
 		if (streq(status, "pending")) {
 			pending_group_id = groupid;
@@ -985,7 +985,7 @@ static struct command_result *pendingsendpays_done(struct command *cmd,
 			plugin_err(pay_plugin->plugin,
 				   "%s json_scan of listsendpay returns the "
 				   "following error: %s",
-				   __PRETTY_FUNCTION__, err);
+				   __func__, err);
 
 		/* If we decide to create a new group, we base it on
 		 * max_group_id */
@@ -1011,7 +1011,7 @@ static struct command_result *pendingsendpays_done(struct command *cmd,
 					     this_sent))
 				plugin_err(pay_plugin->plugin,
 					   "%s (line %d) amount_msat overflow.",
-					   __PRETTY_FUNCTION__, __LINE__);
+					   __func__, __LINE__);
 		}
 		assert(!streq(status, "complete"));
 	}

plugins/renepay/routebuilder.c

@@ -229,7 +229,7 @@ struct route **get_routes(const tal_t *ctx,
 				    ctx, ecode, fail, PLUGIN_ERROR,
 				    "%s: flow is delivering to destination "
 				    "(%s) more than requested (%s)",
-				    __PRETTY_FUNCTION__,
+				    __func__,
 				    fmt_amount_msat(this_ctx, flows[i]->amount),
 				    fmt_amount_msat(this_ctx,
 						    amount_to_deliver));
@@ -285,7 +285,7 @@ struct route **get_routes(const tal_t *ctx,
 				tal_report_error(
 				    ctx, ecode, fail, PLUGIN_ERROR,
 				    "%s failed to build route from flow.",
-				    __PRETTY_FUNCTION__);
+				    __func__);
 				goto function_fail;
 			}
 
@@ -347,7 +347,7 @@ struct route **get_routes(const tal_t *ctx,
 				    ctx, ecode, fail, PLUGIN_ERROR,
 				    "%s routing fees (%s) exceed fee "
 				    "budget (%s).",
-				    __PRETTY_FUNCTION__,
+				    __func__,
 				    fmt_amount_msat(this_ctx, fee),
 				    fmt_amount_msat(this_ctx, feebudget));
 				goto function_fail;
@@ -361,7 +361,7 @@ struct route **get_routes(const tal_t *ctx,
 				    ctx, ecode, fail, PLUGIN_ERROR,
 				    "%s: route delivering to destination (%s) "
 				    "is more than requested (%s)",
-				    __PRETTY_FUNCTION__,
+				    __func__,
 				    fmt_amount_msat(this_ctx, delivering),
 				    fmt_amount_msat(this_ctx,
 						    amount_to_deliver));

plugins/renepay/routefail.c

@@ -33,7 +33,7 @@ struct command_result *routefail_start(const tal_t *ctx, struct route *route,
 	if (payment == NULL)
 		plugin_err(pay_plugin->plugin,
 			   "%s: payment with hash %s not found.",
-			   __PRETTY_FUNCTION__,
+			   __func__,
 			   fmt_sha256(tmpctx, &route->key.payment_hash));
 
 	r->payment = payment;

plugins/renepay/routetracker.c

@@ -13,7 +13,7 @@ static struct payment *route_get_payment_verify(struct route *route)
 	if (!payment)
 		plugin_err(pay_plugin->plugin,
 			   "%s: no payment associated with routekey %s",
-			   __PRETTY_FUNCTION__,
+			   __func__,
 			   fmt_routekey(tmpctx, &route->key));
 	return payment;
 }
@@ -162,14 +162,14 @@ static void route_pending_register(struct routetracker *routetracker,
 	if (route_map_get(pay_plugin->pending_routes, &route->key))
 		plugin_err(pay_plugin->plugin,
 			   "%s: tracking a route (%s) duplicate?",
-			   __PRETTY_FUNCTION__,
+			   __func__,
 			   fmt_routekey(tmpctx, &route->key));
 
 	if (!route_map_del(routetracker->sent_routes, route))
 		plugin_err(pay_plugin->plugin,
 			   "%s: tracking a route (%s) not computed by this "
 			   "payment call",
-			   __PRETTY_FUNCTION__,
+			   __func__,
 			   fmt_routekey(tmpctx, &route->key));
 
 	uncertainty_commit_htlcs(pay_plugin->uncertainty, route);
@@ -179,7 +179,7 @@ static void route_pending_register(struct routetracker *routetracker,
 	    !tal_add_destructor2(route, remove_route,
 				 pay_plugin->pending_routes))
 		plugin_err(pay_plugin->plugin, "%s: failed to register route.",
-			   __PRETTY_FUNCTION__);
+			   __func__);
 
 	if (!amount_msat_add(&payment->total_sent, payment->total_sent,
 			     route_sends(route)) ||
@@ -188,7 +188,7 @@ static void route_pending_register(struct routetracker *routetracker,
 			     route_delivers(route))) {
 		plugin_err(pay_plugin->plugin,
 			   "%s: amount_msat arithmetic overflow.",
-			   __PRETTY_FUNCTION__);
+			   __func__);
 	}
 }
 
@@ -249,7 +249,7 @@ static struct command_result *sendpay_failed(struct command *cmd,
 	if (!route_map_del(routetracker->sent_routes, route))
 		plugin_err(pay_plugin->plugin,
 			   "%s: route (%s) is not marked as sent",
-			   __PRETTY_FUNCTION__,
+			   __func__,
 			   fmt_routekey(tmpctx, &route->key));
 	tal_free(route);
 	return command_still_pending(cmd);
@@ -290,7 +290,7 @@ void payment_collect_results(struct payment *payment,
 				   "%s: current groupid=%" PRIu64
 				   ", but recieved a sendpay result with "
 				   "groupid=%" PRIu64,
-				   __PRETTY_FUNCTION__, payment->groupid,
+				   __func__, payment->groupid,
 				   r->key.groupid);
 			continue;
 		}
@@ -314,7 +314,7 @@ void payment_collect_results(struct payment *payment,
 			plugin_err(pay_plugin->plugin,
 				   "%s: routes do not add up to "
 				   "payment total amount.",
-				   __PRETTY_FUNCTION__);
+				   __func__);
 		}
 	}
 	for (size_t i = 0; i < ncompleted; i++)

plugins/renepay/test/run-route_map.c

@@ -32,7 +32,7 @@ static void destroy_route(
 		struct route_map * map)
 {
 	printf("calling %s with  %s\n",
-		__PRETTY_FUNCTION__,
+		__func__,
 		fmt_routekey(tmpctx,&route->key));
 	route_map_del(map, route);
 }