git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
[sliver-openvswitch.git]
/
tests
/
test-stp.c
diff --git
a/tests/test-stp.c
b/tests/test-stp.c
index
0acc7e0
..
be1b395
100644
(file)
--- a/
tests/test-stp.c
+++ b/
tests/test-stp.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2012 Nicira, Inc.
+ * 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.
*
* 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;
{
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);
va_start(args, message);
vfprintf(stderr, message, args);
va_end(args);
@@
-661,7
+661,7
@@
main(int argc, char *argv[])
}
for (i = 0; i < tc->n_bridges; i++) {
struct bridge *bridge = tc->bridges[i];
}
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);
free(bridge);
}
free(tc);