From: Eric Bollengier Date: Mon, 2 Apr 2007 18:16:35 +0000 (+0000) Subject: ebl rename esc_name2 with esc_path X-Git-Tag: Release-7.0.0~6629 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1054624068b17b39e56d6406d61029e8bfcd865d;p=bacula%2Fbacula ebl rename esc_name2 with esc_path git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4497 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h index e098ae5a7d..b6101e883e 100644 --- a/bacula/src/cats/cats.h +++ b/bacula/src/cats/cats.h @@ -141,7 +141,7 @@ struct B_DB { POOLMEM *fname; /* Filename only */ POOLMEM *path; /* Path only */ POOLMEM *esc_name; /* Escaped file name */ - POOLMEM *esc_name2; /* Escaped path name */ + POOLMEM *esc_path; /* Escaped path name */ int fnl; /* file name length */ int pnl; /* path name length */ }; @@ -261,7 +261,7 @@ struct B_DB { POOLMEM *fname; /* Filename only */ POOLMEM *path; /* Path only */ POOLMEM *esc_name; /* Escaped file name */ - POOLMEM *esc_name2; /* Escaped path name */ + POOLMEM *esc_path; /* Escaped path name */ int fnl; /* file name length */ int pnl; /* path name length */ }; @@ -364,7 +364,7 @@ struct B_DB { POOLMEM *fname; /* Filename only */ POOLMEM *path; /* Path only */ POOLMEM *esc_name; /* Escaped file name */ - POOLMEM *esc_name2; /* Escaped path name */ + POOLMEM *esc_path; /* Escaped path name */ int fnl; /* file name length */ int pnl; /* path name length */ }; @@ -465,7 +465,7 @@ struct B_DB { POOLMEM *fname; /* Filename only */ POOLMEM *path; /* Path only */ POOLMEM *esc_name; /* Escaped file name */ - POOLMEM *esc_name2; /* Escaped path name */ + POOLMEM *esc_path; /* Escaped path name */ int fnl; /* file name length */ int pnl; /* path name length */ }; diff --git a/bacula/src/cats/mysql.c b/bacula/src/cats/mysql.c index 6af54383a3..cabbf3bda8 100644 --- a/bacula/src/cats/mysql.c +++ b/bacula/src/cats/mysql.c @@ -121,7 +121,7 @@ db_init_database(JCR *jcr, const char *db_name, const char *db_user, const char mdb->fname = get_pool_memory(PM_FNAME); mdb->path = get_pool_memory(PM_FNAME); mdb->esc_name = get_pool_memory(PM_FNAME); - mdb->esc_name2 = get_pool_memory(PM_FNAME); + mdb->esc_path = get_pool_memory(PM_FNAME); qinsert(&db_list, &mdb->bq); /* put db in list */ V(mutex); return mdb; @@ -232,7 +232,7 @@ db_close_database(JCR *jcr, B_DB *mdb) free_pool_memory(mdb->fname); free_pool_memory(mdb->path); free_pool_memory(mdb->esc_name); - free_pool_memory(mdb->esc_name2); + free_pool_memory(mdb->esc_path); if (mdb->db_name) { free(mdb->db_name); } diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c index 53282022a4..d1a322e32a 100644 --- a/bacula/src/cats/postgresql.c +++ b/bacula/src/cats/postgresql.c @@ -124,7 +124,7 @@ db_init_database(JCR *jcr, const char *db_name, const char *db_user, const char mdb->fname = get_pool_memory(PM_FNAME); mdb->path = get_pool_memory(PM_FNAME); mdb->esc_name = get_pool_memory(PM_FNAME); - mdb->esc_name2 = get_pool_memory(PM_FNAME); + mdb->esc_path = get_pool_memory(PM_FNAME); mdb->allow_transactions = mult_db_connections; qinsert(&db_list, &mdb->bq); /* put db in list */ V(mutex); @@ -229,7 +229,7 @@ db_close_database(JCR *jcr, B_DB *mdb) free_pool_memory(mdb->fname); free_pool_memory(mdb->path); free_pool_memory(mdb->esc_name); - free_pool_memory(mdb->esc_name2); + free_pool_memory(mdb->esc_path); if (mdb->db_name) { free(mdb->db_name); } @@ -625,8 +625,8 @@ int my_postgresql_batch_insert(JCR *jcr, B_DB *mdb, ATTR_DBR *ar) mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1); my_postgresql_copy_escape(mdb->esc_name, mdb->fname, mdb->fnl); - mdb->esc_name2 = check_pool_memory_size(mdb->esc_name2, mdb->pnl*2+1); - my_postgresql_copy_escape(mdb->esc_name2, mdb->path, mdb->pnl); + mdb->esc_path = check_pool_memory_size(mdb->esc_path, mdb->pnl*2+1); + my_postgresql_copy_escape(mdb->esc_path, mdb->path, mdb->pnl); if (ar->Digest == NULL || ar->Digest[0] == 0) { digest = "0"; @@ -635,7 +635,7 @@ int my_postgresql_batch_insert(JCR *jcr, B_DB *mdb, ATTR_DBR *ar) } len = Mmsg(mdb->cmd, "%u\t%s\t%s\t%s\t%s\t%s\n", - ar->FileIndex, edit_int64(ar->JobId, ed1), mdb->esc_name2, + ar->FileIndex, edit_int64(ar->JobId, ed1), mdb->esc_path, mdb->esc_name, ar->attr, digest); do { diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c index 5909e4420f..d1017cd36a 100644 --- a/bacula/src/cats/sql_create.c +++ b/bacula/src/cats/sql_create.c @@ -709,8 +709,8 @@ bool my_batch_insert(JCR *jcr, B_DB *mdb, ATTR_DBR *ar) mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1); db_escape_string(mdb->esc_name, mdb->fname, mdb->fnl); - mdb->esc_name2 = check_pool_memory_size(mdb->esc_name2, mdb->pnl*2+1); - db_escape_string(mdb->esc_name2, mdb->path, mdb->pnl); + mdb->esc_path = check_pool_memory_size(mdb->esc_path, mdb->pnl*2+1); + db_escape_string(mdb->esc_path, mdb->path, mdb->pnl); if (ar->Digest == NULL || ar->Digest[0] == 0) { digest = "0"; @@ -719,7 +719,7 @@ bool my_batch_insert(JCR *jcr, B_DB *mdb, ATTR_DBR *ar) } len = Mmsg(mdb->cmd, "INSERT INTO batch VALUES (%u,%s,'%s','%s','%s','%s')", - ar->FileIndex, edit_int64(ar->JobId,ed1), mdb->esc_name2, + ar->FileIndex, edit_int64(ar->JobId,ed1), mdb->esc_path, mdb->esc_name, ar->attr, digest); return INSERT_DB(jcr, mdb, mdb->cmd); diff --git a/bacula/src/cats/sqlite.c b/bacula/src/cats/sqlite.c index 3d0007b4c4..935f5eb034 100644 --- a/bacula/src/cats/sqlite.c +++ b/bacula/src/cats/sqlite.c @@ -128,7 +128,7 @@ db_init_database(JCR *jcr, const char *db_name, const char *db_user, const char mdb->fname = get_pool_memory(PM_FNAME); mdb->path = get_pool_memory(PM_FNAME); mdb->esc_name = get_pool_memory(PM_FNAME); - mdb->esc_name2 = get_pool_memory(PM_FNAME); + mdb->esc_path = get_pool_memory(PM_FNAME); mdb->allow_transactions = mult_db_connections; qinsert(&db_list, &mdb->bq); /* put db in list */ V(mutex); @@ -243,7 +243,7 @@ db_close_database(JCR *jcr, B_DB *mdb) free_pool_memory(mdb->fname); free_pool_memory(mdb->path); free_pool_memory(mdb->esc_name); - free_pool_memory(mdb->esc_name2); + free_pool_memory(mdb->esc_path); if (mdb->db_name) { free(mdb->db_name); }