Trivial refactor: move code. View with diff -b

src/fellow_storage.c

@@ -1784,32 +1784,14 @@ sfe_objnew(struct sfe_resurrect_priv *sfer, struct worker *wrk,
 	return (oc);
 }
 
-
-/*
- * create vampire objects for objects in storage
- *
- * used for STVFE_GLOBAL
- */
 static int
-sfe_resurrect(void *priv, const struct fellow_dle *e)
+sfe_resurrect_ban(struct sfe_resurrect_priv *sfer, const struct fellow_dle *e)
 {
-	struct sfe_resurrect_priv *sfer;
 	struct sfe_ban_t ban_t;
-	struct objcore *oc;
-	struct ban *ban;
-	vtim_real t;
-	unsigned n;
 
-	CAST_OBJ_NOTNULL(sfer, priv, SFE_RESURRECT_PRIV_MAGIC);
+	assert(DLE_TYPE(e->type) == DLE_T_BAN_REG ||
+	       DLE_TYPE(e->type) == DLE_T_BAN_IMM);
 
-	n = sfer->n_exp + sfer->n_resurrected;
-	if (n >= sfer->n_t_now_upd || sfer->t_now == 0.0) {
-		sfer->t_now = VTIM_real();
-		sfer->n_t_now_upd = n + sfer->dn_t_now_upd;
-	}
-
-	if (DLE_TYPE(e->type) == DLE_T_BAN_REG ||
-	    DLE_TYPE(e->type) == DLE_T_BAN_IMM) {
 	sfer->has_bans = 1;
 	switch (DLE_TYPE(e->type)) {
 	case DLE_T_BAN_REG:
@@ -1840,8 +1822,34 @@ sfe_resurrect(void *priv, const struct fellow_dle *e)
 	}
 	//fprintf(stdout, "loaded ban %f\n", ban_t);
 	return (0);
+}
+
+/*
+ * create vampire objects for objects in storage
+ *
+ * used for STVFE_GLOBAL
+ */
+static int
+sfe_resurrect(void *priv, const struct fellow_dle *e)
+{
+	struct sfe_resurrect_priv *sfer;
+	struct objcore *oc;
+	struct ban *ban;
+	vtim_real t;
+	unsigned n;
+
+	CAST_OBJ_NOTNULL(sfer, priv, SFE_RESURRECT_PRIV_MAGIC);
+
+	n = sfer->n_exp + sfer->n_resurrected;
+	if (n >= sfer->n_t_now_upd || sfer->t_now == 0.0) {
+		sfer->t_now = VTIM_real();
+		sfer->n_t_now_upd = n + sfer->dn_t_now_upd;
 	}
 
+	if (DLE_TYPE(e->type) == DLE_T_BAN_REG ||
+	    DLE_TYPE(e->type) == DLE_T_BAN_IMM)
+		return (sfe_resurrect_ban(sfer, e));
+
 	if (! sfe_check(sfer, e))
 		return (0);