Merge branch 'dhejyuyr-fix-unreachable-code'

zdohnal · zdohnal · commit 767d72c38bbe · 2025-09-02T08:23:18.000+02:00
Fix unreachable block in IPP backend
diff --git a/backend/ipp.c b/backend/ipp.c
@@ -2116,14 +2116,7 @@ main(int  argc,				/* I - Number of command-line args */
 	password_tries = 0;
       else
       {
-	if (ipp_status != IPP_STATUS_ERROR_SERVICE_UNAVAILABLE &&
-	    ipp_status != IPP_STATUS_ERROR_BUSY)
-	{
-	  ippDelete(response);
-          ipp_status = IPP_STATUS_OK;
-          break;
-	}
-	else if (ipp_status == IPP_STATUS_ERROR_INTERNAL)
+	if (ipp_status == IPP_STATUS_ERROR_INTERNAL)
 	{
 	  waitjob_tries ++;
 
@@ -2134,6 +2127,13 @@ main(int  argc,				/* I - Number of command-line args */
 	    break;
 	  }
 	}
+	else if (ipp_status != IPP_STATUS_ERROR_SERVICE_UNAVAILABLE &&
+	    ipp_status != IPP_STATUS_ERROR_BUSY)
+	{
+	  ippDelete(response);
+	  ipp_status = IPP_STATUS_OK;
+	  break;
+	}
       }
 
       if (response)

Original file line number	Diff line number	Diff line change
`@@ -2116,14 +2116,7 @@ main(int argc, /* I - Number of command-line args */`
`2116`	`2116`	`password_tries = 0;`
`2117`	`2117`	`else`
`2118`	`2118`	`{`
`2119`		`- if (ipp_status != IPP_STATUS_ERROR_SERVICE_UNAVAILABLE &&`
`2120`		`- ipp_status != IPP_STATUS_ERROR_BUSY)`
`2121`		`- {`
`2122`		`- ippDelete(response);`
`2123`		`- ipp_status = IPP_STATUS_OK;`
`2124`		`- break;`
`2125`		`- }`
`2126`		`- else if (ipp_status == IPP_STATUS_ERROR_INTERNAL)`
	`2119`	`+ if (ipp_status == IPP_STATUS_ERROR_INTERNAL)`
`2127`	`2120`	`{`
`2128`	`2121`	`waitjob_tries ++;`
`2129`	`2122`
`@@ -2134,6 +2127,13 @@ main(int argc, /* I - Number of command-line args */`
`2134`	`2127`	`break;`
`2135`	`2128`	`}`
`2136`	`2129`	`}`
	`2130`	`+ else if (ipp_status != IPP_STATUS_ERROR_SERVICE_UNAVAILABLE &&`
	`2131`	`+ ipp_status != IPP_STATUS_ERROR_BUSY)`
	`2132`	`+ {`
	`2133`	`+ ippDelete(response);`
	`2134`	`+ ipp_status = IPP_STATUS_OK;`
	`2135`	`+ break;`
	`2136`	`+ }`
`2137`	`2137`	`}`
`2138`	`2138`
`2139`	`2139`	`if (response)`