X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Fmutation.c;h=0dcd16fec9b54b38d04be7439fcdac887f918752;hb=d2859659800b7e01281d1ca84a726d6b20e98ee1;hp=72d7d0caf29781a52c2949cf87c0a95f8d1f84c6;hpb=8b71367c38c9d2e57261fe7f30cbfc1d20b39401;p=openvswitch diff --git a/ovsdb/mutation.c b/ovsdb/mutation.c index 72d7d0ca..0dcd16fe 100644 --- a/ovsdb/mutation.c +++ b/ovsdb/mutation.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010 Nicira Networks +/* Copyright (c) 2009, 2010, 2011 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -310,7 +310,7 @@ mutate_scalar(const struct ovsdb_type *dst_type, struct ovsdb_datum *dst, } } - error = ovsdb_datum_sort(dst, dst_type); + error = ovsdb_datum_sort(dst, dst_type->key.type); if (error) { ovsdb_error_destroy(error); return ovsdb_error("constraint violation", @@ -327,7 +327,7 @@ ovsdb_mutation_check_count(struct ovsdb_datum *dst, if (!ovsdb_datum_conforms_to_type(dst, dst_type)) { char *s = ovsdb_type_to_english(dst_type); struct ovsdb_error *e = ovsdb_error( - "constaint violation", + "constraint violation", "Attempted to store %u elements in %s.", dst->n, s); free(s); return e;