From ac45f66c0cf86ecb2fb057c79d1f1a5afe3a729d Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Sat, 18 Aug 2012 12:59:03 +0200 Subject: [PATCH] Fix merge errors --- etc/afpd/afp_dsi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 681c9c2c..a841860d 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -381,9 +381,6 @@ static void pending_request(DSI *dsi) void afp_over_dsi_sighandlers(AFPObj *obj) { DSI *dsi = (DSI *) obj->dsi; - int rc_idx; - uint32_t err, cmd; - uint8_t function; struct sigaction action; memset(&action, 0, sizeof(action)); @@ -457,8 +454,8 @@ void afp_over_dsi(AFPObj *obj) { DSI *dsi = (DSI *) obj->dsi; int rc_idx; - u_int32_t err, cmd; - u_int8_t function; + uint32_t err, cmd; + uint8_t function; AFPobj = obj; obj->exit = afp_dsi_die; -- 2.39.2