diff --git a/src/dbStatic/dbLexRoutines.c b/src/dbStatic/dbLexRoutines.c
index cb4979497..ffcde80e9 100644
--- a/src/dbStatic/dbLexRoutines.c
+++ b/src/dbStatic/dbLexRoutines.c
@@ -18,7 +18,7 @@ of this distribution.
  */
 
 /*The routines in this module are serially reusable NOT reentrant*/
-
+
 #ifdef vxWorks
 #include <vxWorks.h>
 #endif
@@ -40,7 +40,7 @@ of this distribution.
 #include <special.h>
 #include <link.h>
 #include <macLib.h>
-
+
 /*private routines */
 static void yyerrorAbort(char *str);
 static void allocTemp(void *pvoid);
@@ -71,7 +71,7 @@ static void dbBreakBody(void);
 static void dbRecordHead(char *recordType,char*name,int visible);
 static void dbRecordField(char *name,char *value);
 static void dbRecordBody(void);
-
+
 /*private declarations*/
 #define MY_BUFFER_SIZE 1024
 static char *my_buffer=NULL;
@@ -344,7 +344,7 @@ static void dbAddPathCmd(char *path)
     dbAddPath(pdbbase,path);
     free((void *)path);
 }
-
+
 static void dbIncludeNew(char *filename)
 {
     inputFile	*pinputFile;
@@ -744,7 +744,7 @@ static void dbDriver(char *name)
     pgphentry->userPvt = pdrvSup;
     ellAdd(&pdbbase->drvList,&pdrvSup->node);
 }
-
+
 static void dbBreakHead(char *name)
 {
     brkTable	*pbrkTable;
diff --git a/src/dbStatic/dbStaticLib.c b/src/dbStatic/dbStaticLib.c
index 7f424832e..0c30d572a 100644
--- a/src/dbStatic/dbStaticLib.c
+++ b/src/dbStatic/dbStaticLib.c
@@ -292,7 +292,7 @@ done:
     dbFinishEntry(&dbEntry);
     return(status);
 }
-
+
 static long putParmString(char **pparm,char *pstring)
 {
     size_t	size;
@@ -1814,7 +1814,7 @@ long dbPutString(DBENTRY *pdbentry,char *pstring)
     case DBF_INLINK:
     case DBF_OUTLINK:
     case DBF_FWDLINK: {
-	    DBLINK	*plink=(DBLINK *)pfield;
+	    DBLINK	*plink;
 	    char	string[80];
 	    char	*pstr=&string[0];
 	    int		ind;
@@ -1827,7 +1827,7 @@ long dbPutString(DBENTRY *pdbentry,char *pstring)
 		status = setLinkType(pdbentry);
 		if(status) {
 		    errMessage(status,"in dbPutString from setLinkType");
-		    return(NULL);
+		    return(status);
 		}
 	    } 
 	    if(stringHasMacro) {
@@ -1839,7 +1839,8 @@ long dbPutString(DBENTRY *pdbentry,char *pstring)
 	    }
 	    if(strlen(pstring)>=sizeof(string)) {
 	        status = S_dbLib_badField;
-	        errMessage(status,"dbPutString received a LONG string");
+	        errMessage(status,
+			"dbPutString received a string that is too long");
 	        return(status);
             }
 	    strcpy(pstr,pstring);