staging: vchiq_arm: remove hardcoded buffer length
authorStefan Wahren <stefan.wahren@i2se.com>
Mon, 31 Oct 2016 14:39:30 +0000 (14:39 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 Nov 2016 10:05:47 +0000 (11:05 +0100)
We better use sizeof instead of hardcoding buffer length multiple
times. This make it easier to increase the buffer in the future.
In order to keep below 80 chars limit make the variable name shorter.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

index 3bc14904e62a39f41d5180ea053079164e0a95d2..6ea8f1335b78644e570c2854cf0e1f86b5f8912c 100644 (file)
@@ -2126,20 +2126,20 @@ static void
 output_timeout_error(VCHIQ_STATE_T *state)
 {
        VCHIQ_ARM_STATE_T *arm_state = vchiq_platform_get_arm_state(state);
-       char service_err[50] = "";
+       char err[50] = "";
        int vc_use_count = arm_state->videocore_use_count;
        int active_services = state->unused_service;
        int i;
 
        if (!arm_state->videocore_use_count) {
-               snprintf(service_err, 50, " Videocore usecount is 0");
+               snprintf(err, sizeof(err), " Videocore usecount is 0");
                goto output_msg;
        }
        for (i = 0; i < active_services; i++) {
                VCHIQ_SERVICE_T *service_ptr = state->services[i];
                if (service_ptr && service_ptr->service_use_count &&
                        (service_ptr->srvstate != VCHIQ_SRVSTATE_FREE)) {
-                       snprintf(service_err, 50, " %c%c%c%c(%d) service has "
+                       snprintf(err, sizeof(err), " %c%c%c%c(%d) service has "
                                "use count %d%s", VCHIQ_FOURCC_AS_4CHARS(
                                        service_ptr->base.fourcc),
                                 service_ptr->client_id,
@@ -2153,7 +2153,7 @@ output_timeout_error(VCHIQ_STATE_T *state)
 output_msg:
        vchiq_log_error(vchiq_susp_log_level,
                "timed out waiting for vc suspend (%d).%s",
-                arm_state->autosuspend_override, service_err);
+                arm_state->autosuspend_override, err);
 
 }