Index: trunk/Ohana/src/libdvo/include/dvodb.h
===================================================================
--- trunk/Ohana/src/libdvo/include/dvodb.h	(revision 42102)
+++ trunk/Ohana/src/libdvo/include/dvodb.h	(revision 42389)
@@ -150,5 +150,5 @@
 
 /* measure fields */
-enum {MEAS_ZERO, 
+typedef enum {MEAS_ZERO, 
       MEAS_GLON, 
       MEAS_GLAT, 
@@ -312,5 +312,5 @@
 
 /* average fields */
-enum {AVE_ZERO, 
+typedef enum {AVE_ZERO, 
       AVE_RA, 
       AVE_DEC, 
@@ -376,5 +376,5 @@
 //       AVE_Xm, 
 
-enum {IMAGE_ZERO, 
+typedef enum {IMAGE_ZERO, 
       IMAGE_RA, 
       IMAGE_DEC, 
Index: trunk/Ohana/src/libdvo/src/coordops.c
===================================================================
--- trunk/Ohana/src/libdvo/src/coordops.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/coordops.c	(revision 42389)
@@ -888,5 +888,5 @@
   
   int OldAIPS;
-  char csys[16], ctype[16];
+  char csys[16], ctype[32];
   double rotate, Lambda;
 
@@ -906,5 +906,5 @@
     if (!strncmp (coords[0].ctype, "SLAT", 4)) strcpy (csys, "SLON");
     if (!strcmp (csys, "NONE")) return (FALSE);
-    snprintf (ctype, 16, "%s-%s", csys, &coords[0].ctype[5]);
+    snprintf (ctype, 32, "%s-%s", csys, &coords[0].ctype[5]);
     gfits_modify (header, "CTYPE1",   "%s",  1, ctype);
   }    
Index: trunk/Ohana/src/libdvo/src/dbFields.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dbFields.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dbFields.c	(revision 42389)
@@ -640,4 +640,7 @@
   if (!strcasecmp (fieldName, "PSF_QF"))     	 ESCAPE (MEAS_PSF_QF,         OPIHI_FLT);
   if (!strcasecmp (fieldName, "PSF_QF_PERFECT")) ESCAPE (MEAS_PSF_QF_PERFECT, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "PSFQF"))     	 ESCAPE (MEAS_PSF_QF,         OPIHI_FLT);
+  if (!strcasecmp (fieldName, "PSFQF_PERFECT"))  ESCAPE (MEAS_PSF_QF_PERFECT, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "PSFQFPERFECT"))   ESCAPE (MEAS_PSF_QF_PERFECT, OPIHI_FLT);
   if (!strcasecmp (fieldName, "PSF_CHISQ"))  	 ESCAPE (MEAS_PSF_CHISQ,      OPIHI_FLT);
   if (!strcasecmp (fieldName, "PSF_NDOF"))  	 ESCAPE (MEAS_PSF_NDOF,       OPIHI_INT);
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c	(revision 42389)
@@ -230,6 +230,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -302,6 +301,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -358,6 +356,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -397,6 +394,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c	(revision 42389)
@@ -225,6 +225,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -294,6 +293,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -353,6 +351,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -390,6 +387,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c	(revision 42389)
@@ -24,6 +24,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -88,6 +87,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -146,6 +144,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -182,6 +179,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c	(revision 42389)
@@ -153,6 +153,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -220,6 +219,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -277,6 +275,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -313,6 +310,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_SIM.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_SIM.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_SIM.c	(revision 42389)
@@ -313,6 +313,5 @@
 
     // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -382,6 +381,5 @@
 
     // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c	(revision 42389)
@@ -249,6 +249,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -317,6 +316,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -375,6 +373,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -411,6 +408,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c	(revision 42389)
@@ -260,6 +260,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -328,6 +327,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -391,6 +389,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -427,6 +424,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c	(revision 42389)
@@ -270,6 +270,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -338,6 +337,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -401,6 +399,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -437,6 +434,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c	(revision 42389)
@@ -308,6 +308,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -376,6 +375,5 @@
 
     // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
-    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -439,6 +437,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -475,6 +472,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c	(revision 42389)
@@ -1134,6 +1134,5 @@
 
     // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -1203,6 +1202,5 @@
 
     // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -1267,6 +1265,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -1303,6 +1300,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5_LOAD.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5_LOAD.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5_LOAD.c	(revision 42389)
@@ -645,6 +645,5 @@
 
     // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -714,6 +713,5 @@
 
     // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -778,6 +776,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -814,6 +811,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V6.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V6.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V6.c	(revision 42389)
@@ -860,6 +860,5 @@
 
     // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -927,6 +926,5 @@
 
     // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -990,6 +988,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -1026,6 +1023,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c	(revision 42389)
@@ -217,6 +217,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -291,6 +290,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -346,6 +344,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
@@ -386,6 +383,5 @@
 
   for (i = 0; i < Nvalues; i++) {
-    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
-    out[i].name[31] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, 31); // out[32], in[32]
 
     out[i].code  = in[i].code;         
Index: trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_loneos.c	(revision 42389)
@@ -195,6 +195,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -270,6 +269,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
Index: trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 42389)
@@ -238,6 +238,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -312,6 +311,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
Index: trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 42389)
@@ -238,6 +238,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
@@ -312,6 +311,5 @@
 
     // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
-    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
-    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
+    strncpy_nowarn (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
 
     out[i].tzero    	    = in[i].tzero;
Index: trunk/Ohana/src/libdvo/src/skydb.c
===================================================================
--- trunk/Ohana/src/libdvo/src/skydb.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/skydb.c	(revision 42389)
@@ -275,5 +275,5 @@
       new[Nnew].depth = 2;
       new[Nnew].child = FALSE;
-      strncpy (root, db[i].name, 5); root[5] = 0;
+      strncpy_nowarn (root, db[i].name, 5); 
       myAssert (snprintf (new[Nnew].name, 18, "%s/r%04d.cpt", root, Rnumber) < 18, "overflow");
       Rnumber ++;      
@@ -364,5 +364,5 @@
 	db[N].depth = 3;
 	db[N].child = FALSE;
-	strncpy (root, db[i].name, 10); root[10] = 0;
+	strncpy_nowarn (root, db[i].name, 10); 
 	myAssert (snprintf (db[N].name, 18, "%s.%02d.cpt", root, Rnumber) < 18, "overflow");
 	Rnumber ++;
Index: trunk/Ohana/src/libdvo/src/skyregion_gsc.c
===================================================================
--- trunk/Ohana/src/libdvo/src/skyregion_gsc.c	(revision 42102)
+++ trunk/Ohana/src/libdvo/src/skyregion_gsc.c	(revision 42389)
@@ -247,5 +247,5 @@
   int i;
   double Rmin, Rmax, Dmin, Dmax;
-  char temp[80], name[80];
+  char temp[50], name[80];
   SkyTable *band;
   SkyRegion *regions;
@@ -254,6 +254,5 @@
   ALLOCATE (regions, SkyRegion, Nregions);
   for (i = 0; i < Nregions; i++) {
-    strncpy (temp, &buffer[i*48], 48);
-    temp[48] = 0;
+    strncpy_nowarn (temp, &buffer[i*48], 48);
     hstgsc_hms_to_deg (&Rmin, &Rmax, &Dmin, &Dmax, &temp[7]);
     if (Dmax < Dmin) SWAP (Dmin, Dmax);