Various operations: remove explicit short name prefixing in log messages now that it is automatically added

3 files changed, 15 insertions, 15 deletions

diff --git a/src/conversions/axisswap.cpp b/src/conversions/axisswap.cpp
index c02bd4e5..33d0937c 100644
--- a/src/conversions/axisswap.cpp
+++ b/src/conversions/axisswap.cpp
@@ -199,7 +199,7 @@ PJ *CONVERSION(axisswap,0) {
         /* check that all characters are valid */
         for (i=0; i<strlen(order); i++)
             if (strchr("1234-,", order[i]) == nullptr) {
-                proj_log_error(P, _("axisswap: unknown axis '%c'"), order[i]);
+                proj_log_error(P, _("unknown axis '%c'"), order[i]);
                 return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
             }
 
@@ -209,7 +209,7 @@ PJ *CONVERSION(axisswap,0) {
         while ( *s != '\0' && n < 4 ) {
             Q->axis[n] = abs(atoi(s))-1;
             if (Q->axis[n] > 3) {
-                proj_log_error(P, _("axisswap: invalid axis '%d'"), Q->axis[n]);
+                proj_log_error(P, _("invalid axis '%d'"), Q->axis[n]);
                 return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
             }
             Q->sign[n++] = sign(atoi(s));
@@ -250,7 +250,7 @@ PJ *CONVERSION(axisswap,0) {
                     Q->axis[i] = 2;
                     break;
                 default:
-                    proj_log_error(P, _("axisswap: unknown axis '%c'"), P->axis[i]);
+                    proj_log_error(P, _("unknown axis '%c'"), P->axis[i]);
                     return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
             }
         }
diff --git a/src/conversions/topocentric.cpp b/src/conversions/topocentric.cpp
index 4f563d9f..88119efa 100644
--- a/src/conversions/topocentric.cpp
+++ b/src/conversions/topocentric.cpp
@@ -97,23 +97,23 @@ PJ *CONVERSION(topocentric,1) {
     const auto hash0 = pj_param_exists(P->params, "h_0");
     if( !hasX0 && !hasLon0 )
     {
-        proj_log_error(P, _("topocentric: missing X_0 or lon_0"));
+        proj_log_error(P, _("missing X_0 or lon_0"));
         return pj_default_destructor(P, PROJ_ERR_INVALID_OP_MISSING_ARG);
     }
     if ( (hasX0 || hasY0 || hasZ0) &&
          (hasLon0 || hasLat0 || hash0) )
     {
-        proj_log_error(P, _("topocentric: (X_0,Y_0,Z_0) and (lon_0,lat_0,h_0) are mutually exclusive"));
+        proj_log_error(P, _("(X_0,Y_0,Z_0) and (lon_0,lat_0,h_0) are mutually exclusive"));
         return pj_default_destructor(P, PROJ_ERR_INVALID_OP_MUTUALLY_EXCLUSIVE_ARGS);
     }
     if( hasX0 && (!hasY0 || !hasZ0) )
     {
-        proj_log_error(P, _("topocentric: missing Y_0 and/or Z_0"));
+        proj_log_error(P, _("missing Y_0 and/or Z_0"));
         return pj_default_destructor(P, PROJ_ERR_INVALID_OP_MISSING_ARG);
     }
     if( hasLon0 && !hasLat0 ) // allow missing h_0
     {
-        proj_log_error(P, _("topocentric: missing lat_0"));
+        proj_log_error(P, _("missing lat_0"));
         return pj_default_destructor(P, PROJ_ERR_INVALID_OP_MISSING_ARG);
     }
 
diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp
index fec8caac..58a60c37 100644
--- a/src/conversions/unitconvert.cpp
+++ b/src/conversions/unitconvert.cpp
@@ -474,7 +474,7 @@ PJ *CONVERSION(unitconvert,0) {
             f = pj_param (P->ctx, P->params, "dxy_in").f;
             if (f == 0.0 || 1.0 / f == 0.0)
             {
-                proj_log_error(P, _("unitconvert: unknown xy_in unit"));
+                proj_log_error(P, _("unknown xy_in unit"));
                 return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
             }
         }
@@ -496,7 +496,7 @@ PJ *CONVERSION(unitconvert,0) {
             f = pj_param (P->ctx, P->params, "dxy_out").f;
             if (f == 0.0 || 1.0 / f == 0.0)
             {
-                proj_log_error(P, _("unitconvert: unknown xy_out unit"));
+                proj_log_error(P, _("unknown xy_out unit"));
                 return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
             }
         }
@@ -511,7 +511,7 @@ PJ *CONVERSION(unitconvert,0) {
 
     if( xy_in_is_linear >= 0 && xy_out_is_linear >= 0 &&
         xy_in_is_linear != xy_out_is_linear ) {
-        proj_log_error(P, _("unitconvert: inconsistent unit type between xy_in and xy_out"));
+        proj_log_error(P, _("inconsistent unit type between xy_in and xy_out"));
         return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
     }
 
@@ -524,7 +524,7 @@ PJ *CONVERSION(unitconvert,0) {
             f = pj_param (P->ctx, P->params, "dz_in").f;
             if (f == 0.0 || 1.0 / f == 0.0)
             {
-                proj_log_error(P, _("unitconvert: unknown z_in unit"));
+                proj_log_error(P, _("unknown z_in unit"));
                 return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
             }
         }
@@ -540,7 +540,7 @@ PJ *CONVERSION(unitconvert,0) {
             f = pj_param (P->ctx, P->params, "dz_out").f;
             if (f == 0.0 || 1.0 / f == 0.0)
             {
-                proj_log_error(P, _("unitconvert: unknown z_out unit"));
+                proj_log_error(P, _("unknown z_out unit"));
                 return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
             }
         }
@@ -549,7 +549,7 @@ PJ *CONVERSION(unitconvert,0) {
 
     if( z_in_is_linear >= 0 && z_out_is_linear >= 0 &&
         z_in_is_linear != z_out_is_linear ) {
-        proj_log_error(P, _("unitconvert: inconsistent unit type between z_in and z_out"));
+        proj_log_error(P, _("inconsistent unit type between z_in and z_out"));
         return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
     }
 
@@ -558,7 +558,7 @@ PJ *CONVERSION(unitconvert,0) {
 
         if (!s)
         {
-            proj_log_error(P, _("unitconvert: unknown t_in unit"));
+            proj_log_error(P, _("unknown t_in unit"));
             return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
         }
 
@@ -572,7 +572,7 @@ PJ *CONVERSION(unitconvert,0) {
 
         if (!s)
         {
-            proj_log_error(P, _("unitconvert: unknown t_out unit"));
+            proj_log_error(P, _("unknown t_out unit"));
             return pj_default_destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
         }