This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Tarantool -- an efficient key/value data store".
The branch master has been updated
via f11b3a08be1882775d164071732ee04c2ab1a7c8 (commit)
from ff02fc0dfc09b770f6d4a5964ccf295208004bf4 (commit)
Summary of changes:
core/exceptions.m | 12 ++++++------
core/fiber.m | 4 ++--
core/log_io.m | 4 ++--
include/exceptions.h | 10 +++++-----
mod/box/box.h | 6 +++---
mod/box/box.m | 18 +++++++++---------
6 files changed, 27 insertions(+), 27 deletions(-)
commit f11b3a08be1882775d164071732ee04c2ab1a7c8
Author: Roman Tokarev <[email protected]>
Date: Fri Apr 8 11:55:03 2011 +0400
Remove underscore from ObjectiveC class fields.
diff --git a/core/exceptions.m b/core/exceptions.m
index fb2b55a..2db8c41 100644
--- a/core/exceptions.m
+++ b/core/exceptions.m
@@ -14,21 +14,21 @@
return e;
}
-- init:(const char *)file:(unsigned)line reason:(const char *)reason
+- init:(const char *)p_file:(unsigned)p_line reason:(const char *)p_reason
{
[super init];
- _file = file;
- _line = line;
+ file = p_file;
+ line = p_line;
- _reason = reason;
+ reason = p_reason;
return self;
}
-- init:(const char *)file:(unsigned)line
+- init:(const char *)p_file:(unsigned)p_line
{
- return [self init:file:line reason:"unknown"];
+ return [self init:p_file:p_line reason:"unknown"];
}
@end
diff --git a/core/fiber.m b/core/fiber.m
index 781f527..9d23203 100644
--- a/core/fiber.m
+++ b/core/fiber.m
@@ -347,12 +347,12 @@ fiber_loop(void *data __attribute__((unused)))
}
@catch (tnt_FiberException *e) {
say_info("fiber `%s': exception `tnt_FiberException':
`%s'",
- fiber->name, e->_reason);
+ fiber->name, e->reason);
say_info("fiber `%s': exiting", fiber->name);
}
@catch (tnt_Exception *e) {
say_error("fiber `%s': exception `%s': `%s'",
- fiber->name, [e name], e->_reason);
+ fiber->name, [e name], e->reason);
panic("fiber `%s': exiting", fiber->name);
}
@catch (id e) {
diff --git a/core/log_io.m b/core/log_io.m
index 8530ffb..718696e 100644
--- a/core/log_io.m
+++ b/core/log_io.m
@@ -931,7 +931,7 @@ recover_snap(struct recovery_state *r)
return 0;
}
@catch (tnt_Exception *e) {
- say_error("tnt_Exception: `%s'", e->_reason);
+ say_error("tnt_Exception: `%s'", e->reason);
say_error("failure reading snapshot");
return -1;
@@ -992,7 +992,7 @@ recover_wal(struct recovery_state *r, struct log_io *l)
return 1;
}
@catch (tnt_Exception *e) {
- say_error("tnt_Exception: `%s'", e->_reason);
+ say_error("tnt_Exception: `%s'", e->reason);
say_error("failure reading xlog");
return -1;
diff --git a/include/exceptions.h b/include/exceptions.h
index 4db13ff..f78206c 100644
--- a/include/exceptions.h
+++ b/include/exceptions.h
@@ -5,15 +5,15 @@
@interface tnt_Exception: Object {
@public
- const char *_file;
- unsigned _line;
- const char *_reason;
+ const char *file;
+ unsigned line;
+ const char *reason;
}
+ alloc;
-- init:(const char *)file:(unsigned)line reason:(const char*)reason;
-- init:(const char *)file:(unsigned)line;
+- init:(const char *)p_file:(unsigned)p_line reason:(const char*)p_reason;
+- init:(const char *)p_file:(unsigned)p_line;
@end
#define tnt_raise(class, message) { \
diff --git a/mod/box/box.h b/mod/box/box.h
index 8988639..b68c613 100644
--- a/mod/box/box.h
+++ b/mod/box/box.h
@@ -32,12 +32,12 @@
@interface tnt_BoxException: tnt_Exception {
@public
- u32 _errcode;
+ u32 errcode;
}
-- init:(const char *)file:(unsigned)line reason:(const char *)reason
errcode:(u32)errcode;
-- init:(const char *)file:(unsigned)line errcode:(u32)errcode;
+- init:(const char *)p_file:(unsigned)p_line reason:(const char *)p_reason
errcode:(u32)p_errcode;
+- init:(const char *)p_file:(unsigned)p_line errcode:(u32)p_errcode;
@end
extern bool box_updates_allowed;
diff --git a/mod/box/box.m b/mod/box/box.m
index 350d80b..7391ffc 100644
--- a/mod/box/box.m
+++ b/mod/box/box.m
@@ -82,11 +82,11 @@ struct box_snap_row {
} __attribute__((packed));
@implementation tnt_BoxException
-- init:(const char *)file:(unsigned)line reason:(const char *)reason
errcode:(u32)errcode
+- init:(const char *)p_file:(unsigned)p_line reason:(const char *)p_reason
errcode:(u32)p_errcode
{
- [super init:file:line reason:reason];
+ [super init:p_file:p_line reason:p_reason];
- _errcode = errcode;
+ errcode = p_errcode;
if (errcode != ERR_CODE_NODE_IS_RO)
say_error("tnt_BoxException: %s/`%s' at %s:%i",
@@ -95,9 +95,9 @@ struct box_snap_row {
return self;
}
-- init:(const char *)file:(unsigned)line errcode:(u32)errcode
+- init:(const char *)p_file:(unsigned)p_line errcode:(u32)p_errcode
{
- return [self init:file:line reason:"unknown" errcode:errcode];
+ return [self init:p_file:p_line reason:"unknown" errcode:p_errcode];
}
@end
@@ -1213,18 +1213,18 @@ box_process(struct box_txn *txn, u32 op, struct tbuf
*request_data)
@catch (tnt_PickleException *e) {
txn_abort(txn);
- say_error("tnt_PickleException: `%s' at %s:%i", e->_reason,
e->_file, e->_line);
+ say_error("tnt_PickleException: `%s' at %s:%i", e->reason,
e->file, e->line);
return ERR_CODE_UNKNOWN_ERROR;
}
@catch (tnt_BoxException *e) {
txn_abort(txn);
- if (e->_errcode != ERR_CODE_NODE_IS_RO)
+ if (e->errcode != ERR_CODE_NODE_IS_RO)
say_error("tnt_BoxException: %s/`%s' at %s:%i",
- error_codes_strs[e->_errcode], e->_reason,
e->_file, e->_line);
+ error_codes_strs[e->errcode], e->reason,
e->file, e->line);
- return e->_errcode;
+ return e->errcode;
}
@catch (id e) {
txn_abort(txn);
--
Tarantool -- an efficient key/value data store
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
