[Spice-devel] [PATCH spice-gtk 6/7] usb-device-manager: Do not give warnings for supported configuration

[Victor Toso]

Hi,

On Thu, Jul 11, 2019 at 02:00:53PM +0100, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  src/usb-device-manager.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
> index c270e1cf..4960667e 100644
> --- a/src/usb-device-manager.c
> +++ b/src/usb-device-manager.c
> @@ -1664,7 +1664,9 @@ gboolean _usbdk_hider_prepare(SpiceUsbDeviceManager *manager)
>  {
>      SpiceUsbDeviceManagerPrivate *priv = manager->priv;
>  
> -    g_return_val_if_fail(priv->usbdk_api != NULL, FALSE);
> +    if (priv->usbdk_api == NULL) {
> +        return FALSE;
> +    }
>  
>      if (priv->usbdk_hider_handle == NULL) {
>          priv->usbdk_hider_handle = usbdk_create_hider_handle(priv->usbdk_api);
> @@ -1682,7 +1684,9 @@ void _usbdk_hider_clear(SpiceUsbDeviceManager *manager)
>  {
>      SpiceUsbDeviceManagerPrivate *priv = manager->priv;
>  
> -    g_return_if_fail(priv->usbdk_api != NULL);
> +    if (priv->usbdk_api == NULL) {
> +        return;
> +    }
>  
>      if (priv->usbdk_hider_handle != NULL) {
>          usbdk_clear_hide_rules(priv->usbdk_api, priv->usbdk_hider_handle);
> @@ -1696,7 +1700,9 @@ void _usbdk_hider_update(SpiceUsbDeviceManager *manager)
>  {
>      SpiceUsbDeviceManagerPrivate *priv = manager->priv;
>  
> -    g_return_if_fail(priv->usbdk_api != NULL);
> +    if (priv->usbdk_api == NULL) {
> +        return;
> +    }

Just to be sure that we still get a warning of some sort on
Windows without USBDk installed, pretty sure there is message
about it in the console and pretty sure as well that those
CRITICALs were too much

>  
>      if (priv->auto_connect_filter == NULL) {
>          SPICE_DEBUG("No autoredirect rules, no hider setup needed");
> -- 
> 2.20.1
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20190711/4ee403b5/attachment.sig>