core: assorted typos and spelling mistakes reported by Debian lintian

Also missing bang (!) in #!/bin/bash in shell scripts.

Backport of
> http://review.gluster.org/#/c/14398/
> BUG: 1336793
> Change-Id: I567a4be8f0f31f6285550f243fe802895f6bc43b

Change-Id: I003554daede9937a41010e085c74e77957c5c608
BUG: 1336794
Reported-by: Patrick Matthäi <pmatthaei@debian.org>
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/14400
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>

3 files changed, 15 insertions, 15 deletions

diff --git a/libglusterfs/src/fd-lk.c b/libglusterfs/src/fd-lk.c
index 01c6c1a0157..358cf3b616a 100644
--- a/libglusterfs/src/fd-lk.c
+++ b/libglusterfs/src/fd-lk.c
@@ -446,7 +446,7 @@ fd_lk_insert_and_merge (fd_t *fd, int32_t cmd,
         lk_ctx = fd_lk_ctx_ref (fd->lk_ctx);
         lk     = fd_lk_ctx_node_new (cmd, flock);
 
-        gf_msg_debug ("fd-lk", 0, "new lock requrest: owner = %s, fl_type = %s"
+        gf_msg_debug ("fd-lk", 0, "new lock request: owner = %s, fl_type = %s"
                       ", fs_start = %"PRId64", fs_end = %"PRId64", user_flock:"
                       " l_type = %s, l_start = %"PRId64", l_len = %"PRId64,
                       lkowner_utoa (&flock->l_owner),
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c
index 1d10afdaef7..04781be562a 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3.c
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c
@@ -650,7 +650,7 @@ gf_sqlite3_find_all (void *db_conn, gf_query_callback_t query_callback,
                                 &prep_stmt, 0);
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
-                        LG_MSG_PREPARE_FAILED, "Failed to prepare statment %s :"
+                        LG_MSG_PREPARE_FAILED, "Failed to prepare statement %s :"
                         "%s", query_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
@@ -726,7 +726,7 @@ gf_sqlite3_find_recently_changed_files(void *db_conn,
                                &prep_stmt, 0);
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
-                        LG_MSG_PREPARE_FAILED, "Failed to prepare statment %s :"
+                        LG_MSG_PREPARE_FAILED, "Failed to prepare statement %s :"
                         " %s", query_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
@@ -826,7 +826,7 @@ gf_sqlite3_find_unchanged_for_time (void *db_conn,
                                &prep_stmt, 0);
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
-                        LG_MSG_PREPARE_FAILED, "Failed to prepare statment %s :"
+                        LG_MSG_PREPARE_FAILED, "Failed to prepare statement %s :"
                         " %s", query_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
@@ -938,7 +938,7 @@ gf_sqlite3_find_recently_changed_files_freq (void *db_conn,
                                 &prep_stmt, 0);
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
-                        LG_MSG_PREPARE_FAILED, "Failed to prepare statment %s :"
+                        LG_MSG_PREPARE_FAILED, "Failed to prepare statement %s :"
                         " %s", query_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
@@ -1099,7 +1099,7 @@ gf_sqlite3_find_unchanged_for_time_freq (void *db_conn,
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED, "Failed to prepare delete "
-                        "statment %s : %s", query_str,
+                        "statement %s : %s", query_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
index 906fdd261f7..8e1e27ff082 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
@@ -48,7 +48,7 @@ gf_sql_delete_all (gf_sql_connection_t  *sql_conn,
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED, "Failed preparing delete "
-                        "statment %s : %s", delete_link_str,
+                        "statement %s : %s", delete_link_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;
@@ -88,7 +88,7 @@ gf_sql_delete_all (gf_sql_connection_t  *sql_conn,
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED, "Failed preparing delete "
-                        "statment %s : %s", delete_file_str,
+                        "statement %s : %s", delete_file_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;
@@ -148,7 +148,7 @@ gf_sql_delete_link (gf_sql_connection_t  *sql_conn,
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED, "Failed preparing delete "
-                        "statment %s : %s", delete_str,
+                        "statement %s : %s", delete_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;
@@ -243,7 +243,7 @@ gf_sql_update_link_flags (gf_sql_connection_t  *sql_conn,
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED, "Failed preparing update "
-                        "statment %s : %s", update_str,
+                        "statement %s : %s", update_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;
@@ -345,7 +345,7 @@ gf_sql_insert_link (gf_sql_connection_t  *sql_conn,
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED,
                         "Failed preparing insert "
-                        "statment %s : %s", insert_str,
+                        "statement %s : %s", insert_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;
@@ -459,7 +459,7 @@ gf_sql_update_link (gf_sql_connection_t  *sql_conn,
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED, "Failed preparing insert "
-                        "statment %s : %s", insert_str,
+                        "statement %s : %s", insert_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;
@@ -542,7 +542,7 @@ gf_sql_insert_write_wind_time (gf_sql_connection_t      *sql_conn,
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED, "Failed preparing insert "
-                        "statment %s : %s", insert_str,
+                        "statement %s : %s", insert_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;
@@ -621,7 +621,7 @@ gf_update_time (gf_sql_connection_t    *sql_conn,
         GF_VALIDATE_OR_GOTO (GFDB_STR_SQLITE3, update_time, out);
 
         /*
-         * Constructing the prepare statment string.
+         * Constructing the prepare statement string.
          *
          * */
         /*For write time*/
@@ -671,7 +671,7 @@ gf_update_time (gf_sql_connection_t    *sql_conn,
         if (ret != SQLITE_OK) {
                 gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0,
                         LG_MSG_PREPARE_FAILED, "Failed preparing insert "
-                        "statment %s : %s", update_str,
+                        "statement %s : %s", update_str,
                         sqlite3_errmsg (sql_conn->sqlite3_db_conn));
                 ret = -1;
                 goto out;