From 2eb20a6d854fe2e799fc52d6cb97bb5d132dbdbc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 13 Aug 2018 14:43:05 -0500 Subject: [PATCH] mon: fix try/catch whitespace Signed-off-by: Sage Weil --- src/mon/AuthMonitor.cc | 6 ++---- src/mon/ConfigMonitor.cc | 6 ++---- src/mon/LogMonitor.cc | 6 ++---- src/mon/MDSMonitor.cc | 6 ++---- src/mon/MgrMonitor.cc | 6 ++---- src/mon/MonmapMonitor.cc | 3 +-- src/mon/OSDMonitor.cc | 6 ++---- 7 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 04f5f17ac448..fe714f07ae8a 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -413,8 +413,7 @@ bool AuthMonitor::preprocess_query(MonOpRequestRef op) case MSG_MON_COMMAND: try { return preprocess_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; @@ -440,8 +439,7 @@ bool AuthMonitor::prepare_update(MonOpRequestRef op) case MSG_MON_COMMAND: try { return prepare_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc index 246aa1617759..fe274bacf18c 100644 --- a/src/mon/ConfigMonitor.cc +++ b/src/mon/ConfigMonitor.cc @@ -111,8 +111,7 @@ bool ConfigMonitor::preprocess_query(MonOpRequestRef op) case MSG_MON_COMMAND: try { return preprocess_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; @@ -376,8 +375,7 @@ bool ConfigMonitor::prepare_update(MonOpRequestRef op) case MSG_MON_COMMAND: try { return prepare_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 31872b11de42..f067ba42b971 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -260,8 +260,7 @@ bool LogMonitor::preprocess_query(MonOpRequestRef op) case MSG_MON_COMMAND: try { return preprocess_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; @@ -285,8 +284,7 @@ bool LogMonitor::prepare_update(MonOpRequestRef op) case MSG_MON_COMMAND: try { return prepare_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 1f467523d3cf..e9317d474280 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -288,8 +288,7 @@ bool MDSMonitor::preprocess_query(MonOpRequestRef op) case MSG_MON_COMMAND: try { return preprocess_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; @@ -509,8 +508,7 @@ bool MDSMonitor::prepare_update(MonOpRequestRef op) case MSG_MON_COMMAND: try { return prepare_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index bccc7386e543..50d74dbf10a3 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -252,8 +252,7 @@ bool MgrMonitor::preprocess_query(MonOpRequestRef op) case MSG_MON_COMMAND: try { return preprocess_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; @@ -276,8 +275,7 @@ bool MgrMonitor::prepare_update(MonOpRequestRef op) case MSG_MON_COMMAND: try { return prepare_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index 0e627399fef0..d62c5b1eb63d 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -414,8 +414,7 @@ bool MonmapMonitor::prepare_update(MonOpRequestRef op) case MSG_MON_COMMAND: try { return prepare_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 072456a6aa13..0ca72ee7eb05 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2047,8 +2047,7 @@ bool OSDMonitor::preprocess_query(MonOpRequestRef op) case MSG_MON_COMMAND: try { return preprocess_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; @@ -2114,8 +2113,7 @@ bool OSDMonitor::prepare_update(MonOpRequestRef op) case MSG_MON_COMMAND: try { return prepare_command(op); - } - catch (const bad_cmd_get& e) { + } catch (const bad_cmd_get& e) { bufferlist bl; mon->reply_command(op, -EINVAL, e.what(), bl, get_last_committed()); return true; -- 2.47.3