X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-stp.c;h=be1b3959f5bd5836f910182578b9bbd0e96dd54a;hb=5521e08eb7a233129208a1c04ee11a0599f25879;hp=259dc74a3725df974d0eefc0662fe2c87ccf198f;hpb=634408e0c5e9d99b55c40ab4df608f822ef923a7;p=sliver-openvswitch.git diff --git a/tests/test-stp.c b/tests/test-stp.c index 259dc74a3..be1b3959f 100644 --- a/tests/test-stp.c +++ b/tests/test-stp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -325,7 +325,7 @@ err(const char *message, ...) { va_list args; - fprintf(stderr, "%s:%d:%td: ", file_name, line_number, pos - line); + fprintf(stderr, "%s:%d:%"PRIdPTR": ", file_name, line_number, pos - line); va_start(args, message); vfprintf(stderr, message, args); va_end(args); @@ -656,12 +656,12 @@ main(int argc, char *argv[]) for (i = 0; i < tc->n_lans; i++) { struct lan *lan = tc->lans[i]; - free((char *) lan->name); + free(CONST_CAST(char *, lan->name)); free(lan); } for (i = 0; i < tc->n_bridges; i++) { struct bridge *bridge = tc->bridges[i]; - stp_destroy(bridge->stp); + stp_unref(bridge->stp); free(bridge); } free(tc);