[PATCH] implement MSIMODIFY_MERGE function in TABLE_modify

Dmitry Timoshkov dmitry at baikal.ru
Mon Mar 26 05:25:26 CDT 2012


Andoni Morales <ylatuya at gmail.com> wrote:

> -    case MSIMODIFY_REPLACE:
>      case MSIMODIFY_MERGE:
> +      /* check for a duplicated key */
> +      r = msi_table_find_row( tv, rec, &row, column );
> +      if (r == ERROR_SUCCESS) {
> +        /* check that both are identical */
> +        r = compare_record (tv, row, rec);
> +        if (r != ERROR_SUCCESS)
> +          break;
> +      } else {
> +        r = table_validate_new( tv, rec, NULL );
> +        if (r != ERROR_SUCCESS)
> +          break;
> +        r = TABLE_insert_row( view, rec, -1, FALSE );
> +          break;
> +      }
> +
> +    case MSIMODIFY_REPLACE:
>      case MSIMODIFY_VALIDATE:

Please get rid of redundant 'break' statements, and add one at the end
of case processing.

-- 
Dmitry.



More information about the wine-devel mailing list