Adjusting SQL interface (goodkey -> gooddata)

diff --git a/lib/devsql.c b/lib/devsql.c
index 46b8699aae321d5f9c0c4f833cad63806442574e..4076076051045fc253360e9d92146c8a16d961ab 100644 (file)
--- a/lib/devsql.c
+++ b/lib/devsql.c
@@ -492,18 +492,18 @@ return (SQLPTR *)sql;
 /*      (no character to be misunderstood by database)  */
 /*                                                      */
 /********************************************************/
-PUBLIC char *sql_goodkey(SQLPTR *sqlptr,char *key)
+PUBLIC char *sql_gooddata(SQLPTR *sqlptr,char *key)
 
 {
-#define OPEP    "devsql.c:sql_goodkey,"
+#define OPEP    "devsql.c:sql_gooddata,"
 
-char *goodkey;
+char *gooddata;
 char *sqlkey;
 SQLTYP *sql;
 int phase;
 _Bool proceed;
 
-goodkey=(char *)0;
+gooddata=(char *)0;
 sqlkey=(char *)0;
 sql=(SQLTYP *)sqlptr;
 phase=0;
@@ -525,10 +525,10 @@ while (proceed==true) {
     case 2      :       //cleaning quote according daemon type
       switch(sql->sqldb) {
         case (db_postgres)     :
-          goodkey=pos_cleanquote(sqlkey);
+          gooddata=pos_cleanquote(sqlkey);
           break;
         case (db_maria)        :
-          goodkey=mar_cleanquote(sqlkey);
+          gooddata=mar_cleanquote(sqlkey);
           break;
         case (db_unknown)     :
         default               :
@@ -543,7 +543,7 @@ while (proceed==true) {
     }
   phase++;
   }
-return goodkey;
+return gooddata;
 #undef  OPEP
 }
 /*
@@ -561,13 +561,13 @@ PUBLIC _Bool sql_mngusr(SQLPTR *sqlptr,SQLENUM action,char *email,USRTYP **usr)
 #define OPEP    "devsql.c:sql_mngusr,"
 
 _Bool isok;
-char *goodkey;
+char *gooddata;
 SQLTYP *sql;
 int phase;
 _Bool proceed;
 
 isok=false;
-goodkey=(char *)0;
+gooddata=(char *)0;
 sql=(SQLTYP *)sqlptr;
 phase=0;
 proceed=true;
@@ -578,7 +578,7 @@ while (proceed==true) {
         (void) rou_alert(0,"%s SQL pointer is NUll (Bug?)",OPEP);
         phase=999;
         }
-      if ((goodkey=sql_goodkey(sql,email))==(char *)0) {
+      if ((gooddata=sql_gooddata(sql,email))==(char *)0) {
         (void) rou_alert(0,"%s %s table, key <%s> not acceptable!",
                             OPEP,EMAILS,email);
         phase=999;
@@ -587,13 +587,13 @@ while (proceed==true) {
     case 1      :       //getting user information
       switch (action) {
         case sql_select :
-          if ((*usr=select_user(sql,goodkey))!=(USRTYP *)0)
+          if ((*usr=select_user(sql,gooddata))!=(USRTYP *)0)
             isok=true;
           break;
         default :
           (void) rou_alert(0,"%s action='%d' not yet implemented!",OPEP,action);
         }
-      goodkey=rou_freestr(goodkey);
+      gooddata=rou_freestr(gooddata);
       break;
     default     :
       proceed=false;

diff --git a/lib/devsql.h b/lib/devsql.h
index 1ae647f6d1a0a7c153d214f6cfa39afd504d1237..785e7e50bbb792d52c1cbe1b118b53a7f3e3353a 100644 (file)
--- a/lib/devsql.h
+++ b/lib/devsql.h
@@ -21,7 +21,7 @@ extern SQLPTR *sql_closesql(SQLPTR *sqlptr);
 
 //procedure to make sure a string is acceptable
 //as key search by database
-extern char *sql_goodkey(SQLPTR *sqlptr,char *key);
+extern char *sql_gooddata(SQLPTR *sqlptr,char *key);
 
 //procedure to get information on exiting user
 extern _Bool sql_mngusr(SQLPTR *sqlptr,SQLENUM action,char *email,USRTYP **usr);