diff --git a/NetworkPkg/Application/VConfig/VConfig.c b/NetworkPkg/Application/VConfig/VConfig.c index 2c323e377b..25074629e8 100644 --- a/NetworkPkg/Application/VConfig/VConfig.c +++ b/NetworkPkg/Application/VConfig/VConfig.c @@ -83,7 +83,7 @@ LocateNicHandleBuffer ( HandleBuffer ); if (EFI_ERROR (Status)) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_LOCATE_FAIL), mHiiHandle, Status); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_LOCATE_FAIL), mHiiHandle, Status); } } @@ -148,7 +148,7 @@ NicNameToHandle ( Index = NicNameToIndex (Name); if (Index >= NumberOfHandles) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_INVALID_IF), mHiiHandle, Name); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_INVALID_IF), mHiiHandle, Name); Handle = NULL; } else { Handle = HandleBuffer[Index]; @@ -233,28 +233,25 @@ ShowNicVlanInfo ( MacStr = NULL; Status = NetLibGetMacString (Handle, mImageHandle, &MacStr); if (EFI_ERROR (Status)) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_MAC_FAIL), mHiiHandle, Status); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_MAC_FAIL), mHiiHandle, Status); goto Exit; } - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_ETH_MAC), mHiiHandle, NicIndex, MacStr); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_ETH_MAC), mHiiHandle, NicIndex, MacStr); Status = VlanConfig->Find (VlanConfig, NULL, &NumberOfVlan, &VlanData); if (EFI_ERROR (Status)) { if (Status == EFI_NOT_FOUND) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_VLAN), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_NO_VLAN), mHiiHandle); } else { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_FIND_FAIL), mHiiHandle, Status); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_FIND_FAIL), mHiiHandle, Status); } goto Exit; } for (Index = 0; Index < NumberOfVlan; Index++) { - ShellPrintHiiEx ( - -1, - -1, - NULL, + ShellPrintHiiDefaultEx ( STRING_TOKEN (STR_VCONFIG_VLAN_DISPLAY), mHiiHandle, VlanData[Index].VlanId, @@ -375,7 +372,7 @@ AddVlan ( Priority = 0; if (ParamStr == NULL) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_IF), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_NO_IF), mHiiHandle); return; } @@ -435,13 +432,13 @@ AddVlan ( // Check VLAN ID. // if ((VlanIdStr == NULL) || (*VlanIdStr == 0)) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_VID), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_NO_VID), mHiiHandle); goto Exit; } VlanId = StrToVlanId (VlanIdStr); if (VlanId > 4094) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_INVALID_VID), mHiiHandle, VlanIdStr); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_INVALID_VID), mHiiHandle, VlanIdStr); goto Exit; } @@ -451,7 +448,7 @@ AddVlan ( if ((PriorityStr != NULL) && (*PriorityStr != 0)) { Priority = StrDecimalToUintn (PriorityStr); if (Priority > 7) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_INVALID_PRIORITY), mHiiHandle, PriorityStr); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_INVALID_PRIORITY), mHiiHandle, PriorityStr); goto Exit; } } @@ -461,7 +458,7 @@ AddVlan ( // Status = VlanConfig->Set (VlanConfig, (UINT16)VlanId, (UINT8)Priority); if (EFI_ERROR (Status)) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_SET_FAIL), mHiiHandle, Status); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_SET_FAIL), mHiiHandle, Status); goto Exit; } @@ -473,7 +470,7 @@ AddVlan ( gBS->ConnectController (VlanHandle, NULL, NULL, TRUE); } - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_SET_SUCCESS), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_SET_SUCCESS), mHiiHandle); Exit: if (VlanConfig != NULL) { @@ -507,7 +504,7 @@ DeleteVlan ( VlanConfig = NULL; if (ParamStr == NULL) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_IF), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_NO_IF), mHiiHandle); return; } @@ -542,13 +539,13 @@ DeleteVlan ( // Check VLAN ID // if ((VlanIdStr == NULL) || (*VlanIdStr == 0)) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_VID), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_NO_VID), mHiiHandle); goto Exit; } VlanId = StrToVlanId (VlanIdStr); if (VlanId > 4094) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_INVALID_VID), mHiiHandle, VlanIdStr); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_INVALID_VID), mHiiHandle, VlanIdStr); goto Exit; } @@ -558,9 +555,9 @@ DeleteVlan ( Status = VlanConfig->Remove (VlanConfig, (UINT16)VlanId); if (EFI_ERROR (Status)) { if (Status == EFI_NOT_FOUND) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NOT_FOUND), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_NOT_FOUND), mHiiHandle); } else { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_REMOVE_FAIL), mHiiHandle, Status); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_REMOVE_FAIL), mHiiHandle, Status); } goto Exit; @@ -579,7 +576,7 @@ DeleteVlan ( FreePool (VlanData); } - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_REMOVE_SUCCESS), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_REMOVE_SUCCESS), mHiiHandle); Exit: if (VlanConfig != NULL) { @@ -648,7 +645,7 @@ VlanConfigMain ( List = NULL; ShellCommandLineParseEx (mParamList, &List, NULL, FALSE, FALSE); if (List == NULL) { - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_ARG), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_NO_ARG), mHiiHandle); goto Exit; } @@ -673,7 +670,7 @@ VlanConfigMain ( // // No valid argument till now. // - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_VCONFIG_NO_ARG), mHiiHandle); + ShellPrintHiiDefaultEx (STRING_TOKEN (STR_VCONFIG_NO_ARG), mHiiHandle); Exit: if (List != NULL) {