Use plain char * instead of s_char *. Doc clarifications.

diff --git a/include/product.h b/include/product.h
index d9034a0ac7700958146d0131739f0c67aa392725..8335ff650962c4dc92fa7c2d32c7db4b38e90d76 100644 (file)
--- a/include/product.h
+++ b/include/product.h
@@ -43,8 +43,8 @@ enum { MAXPRCON = 3 };
 struct pchrstr {
     u_char p_ctype[MAXPRCON];  /* constituent types */
     u_short p_camt[MAXPRCON];  /* constituent amounts */
 struct pchrstr {
     u_char p_ctype[MAXPRCON];  /* constituent types */
     u_short p_camt[MAXPRCON];  /* constituent amounts */

-    int p_type;                        /* vtype if product is a variable */
-    int p_level;               /* index (NAT_?LEV) if product is not a var */
+    int p_type;                        /* product item type, or I_NONE if level */
+    int p_level;               /* level index (NAT_?LEV), or -1 if item */

     int p_cost;                        /* dollars / product unit */
     int p_nrndx;               /* index into sect of natural resource */
     int p_nrdep;               /* depletion as a % of resource used */
     int p_cost;                        /* dollars / product unit */
     int p_nrndx;               /* index into sect of natural resource */
     int p_nrdep;               /* depletion as a % of resource used */


@@ -52,8 +52,8 @@ struct pchrstr {
     int p_nlmin;               /* minimum lvl required */
     int p_nllag;               /* lag, mul by (lvl-nlmin)/(lvl-nlmin+nllag) */
     int p_effic;               /* process efficiency, mult by p_effic/100 */
     int p_nlmin;               /* minimum lvl required */
     int p_nllag;               /* lag, mul by (lvl-nlmin)/(lvl-nlmin+nllag) */
     int p_effic;               /* process efficiency, mult by p_effic/100 */

-    s_char *p_name;            /* name of product */
-    s_char *p_sname;           /* short (7char or less) name of product */
+    char *p_name;              /* name of product */
+    char *p_sname;             /* short (7 char or less) name of product */

 };
 
 #define        P_SHELL 1
 };
 
 #define        P_SHELL 1