]> granicus.if.org Git - curl/commitdiff
tftp: silence bad-function-cast warning
authorMarcel Raad <raad@teamviewer.com>
Sun, 7 May 2017 14:26:19 +0000 (16:26 +0200)
committerMarcel Raad <raad@teamviewer.com>
Sun, 7 May 2017 14:26:19 +0000 (16:26 +0200)
The cases this warns about are handled elsewhere, so just use an
intermediate variable to silence the warning.

lib/tftp.c

index 098b1bb9a1a6fe8520ef4e0517e03a5ca8e14e35..b2b3efe0c511195f161c5f2a26d6ab45ff2bd649 100644 (file)
@@ -1119,7 +1119,8 @@ static CURLcode tftp_receive_packet(struct connectdata *conn)
   }
   else {
     /* The event is given by the TFTP packet time */
-    state->event = (tftp_event_t)getrpacketevent(&state->rpacket);
+    unsigned short event = getrpacketevent(&state->rpacket);
+    state->event = (tftp_event_t)event;
 
     switch(state->event) {
     case TFTP_EVENT_DATA:
@@ -1138,9 +1139,12 @@ static CURLcode tftp_receive_packet(struct connectdata *conn)
       }
       break;
     case TFTP_EVENT_ERROR:
-      state->error = (tftp_error_t)getrpacketblock(&state->rpacket);
+    {
+      unsigned short error = getrpacketblock(&state->rpacket);
+      state->error = (tftp_error_t)error;
       infof(data, "%s\n", (const char *)state->rpacket.data+4);
       break;
+    }
     case TFTP_EVENT_ACK:
       break;
     case TFTP_EVENT_OACK: