projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bond: Don't send learning packets on STABLE bonds.
[openvswitch]
/
ovsdb
/
log.c
diff --git
a/ovsdb/log.c
b/ovsdb/log.c
index 67043078f73da192f52971c771d5bcb101175042..ab4a150ca6beacd00297c54bf97e6d3f4c76817e 100644
(file)
--- a/
ovsdb/log.c
+++ b/
ovsdb/log.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010, 2011 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-289,7
+289,7
@@
ovsdb_log_read(struct ovsdb_log *file, struct json **jsonp)
file->prev_offset = file->offset;
file->offset = data_offset + data_length;
*jsonp = json;
file->prev_offset = file->offset;
file->offset = data_offset + data_length;
*jsonp = json;
- return
0
;
+ return
NULL
;
error:
file->read_error = ovsdb_error_clone(error);
error:
file->read_error = ovsdb_error_clone(error);
@@
-372,7
+372,7
@@
ovsdb_log_write(struct ovsdb_log *file, struct json *json)
file->offset += strlen(header) + length;
free(json_string);
file->offset += strlen(header) + length;
free(json_string);
- return
0
;
+ return
NULL
;
error:
file->write_error = ovsdb_error_clone(error);
error:
file->write_error = ovsdb_error_clone(error);
@@
-386,7
+386,7
@@
ovsdb_log_commit(struct ovsdb_log *file)
if (fsync(fileno(file->stream))) {
return ovsdb_io_error(errno, "%s: fsync failed", file->name);
}
if (fsync(fileno(file->stream))) {
return ovsdb_io_error(errno, "%s: fsync failed", file->name);
}
- return
0
;
+ return
NULL
;
}
/* Returns the current offset into the file backing 'log', in bytes. This
}
/* Returns the current offset into the file backing 'log', in bytes. This