ncurses 5.2

[ncurses.git] / form / fty_enum.c

diff --git a/form/fty_enum.c b/form/fty_enum.c
index 16695cd29915fd09b24ddc387b1d35aa21f97e03..4ad69fb50a7db5606e14ec05e9e442cc6a41fd24 100644 (file)
--- a/form/fty_enum.c
+++ b/form/fty_enum.c
@@ -7,13 +7,13 @@
  */
 /***************************************************************************
 *                                                                          *
  */
 /***************************************************************************
 *                                                                          *

-*  Author : Juergen Pfeifer, Juergen.Pfeifer@T-Online.de                   *
+*  Author : Juergen Pfeifer, juergen.pfeifer@gmx.net                       *

 *                                                                          *
 ***************************************************************************/
 
 #include "form.priv.h"
 
 *                                                                          *
 ***************************************************************************/
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: fty_enum.c,v 1.8 1997/10/18 19:33:20 tom Exp $")
+MODULE_ID("$Id: fty_enum.c,v 1.14 2000/10/18 09:28:19 juergen Exp $")

 
 typedef struct {
   char **kwds;
 
 typedef struct {
   char **kwds;


@@ -33,20 +33,21 @@ typedef struct {
 static void *Make_Enum_Type(va_list * ap)
 {
   enumARG *argp = (enumARG *)malloc(sizeof(enumARG));
 static void *Make_Enum_Type(va_list * ap)
 {
   enumARG *argp = (enumARG *)malloc(sizeof(enumARG));

-  char **kp;
-  int cnt=0;

 
   if (argp)
     {
 
   if (argp)
     {

+      int cnt = 0;
+      char **kp = (char **)0;

       int ccase, cunique;
       int ccase, cunique;

+

       argp->kwds        = va_arg(*ap,char **);
       ccase             = va_arg(*ap,int);
       cunique           = va_arg(*ap,int);
       argp->checkcase   = ccase   ? TRUE : FALSE;
       argp->checkunique = cunique ? TRUE : FALSE;
       argp->kwds        = va_arg(*ap,char **);
       ccase             = va_arg(*ap,int);
       cunique           = va_arg(*ap,int);
       argp->checkcase   = ccase   ? TRUE : FALSE;
       argp->checkunique = cunique ? TRUE : FALSE;

-    
+

       kp = argp->kwds;
       kp = argp->kwds;

-      while( (*kp++) ) cnt++;
+      while( kp && (*kp++) ) cnt++;

       argp->count = cnt;
     }
   return (void *)argp;
       argp->count = cnt;
     }
   return (void *)argp;


@@ -62,11 +63,12 @@ static void *Make_Enum_Type(va_list * ap)
 +--------------------------------------------------------------------------*/
 static void *Copy_Enum_Type(const void * argp)
 {
 +--------------------------------------------------------------------------*/
 static void *Copy_Enum_Type(const void * argp)
 {

-  const enumARG *ap = (const enumARG *)argp;

   enumARG *result = (enumARG *)0;
 
   if (argp)
     {
   enumARG *result = (enumARG *)0;
 
   if (argp)
     {

+      const enumARG *ap = (const enumARG *)argp;
+

       result = (enumARG *)malloc(sizeof(enumARG));
       if (result)
        *result = *ap;
       result = (enumARG *)malloc(sizeof(enumARG));
       if (result)
        *result = *ap;


@@ -165,14 +167,14 @@ static bool Check_Enum_Field(FIELD * field, const void  * argp)
   char *s, *t, *p;
   int res;
   
   char *s, *t, *p;
   int res;
   

-  while( (s=(*kwds++)) )
+  while( kwds && (s=(*kwds++)) )

     {
       if ((res=Compare((unsigned char *)s,bp,ccase))!=NOMATCH)
        {
          p=t=s; /* t is at least a partial match */
          if ((unique && res!=EXACT)) 
            {
     {
       if ((res=Compare((unsigned char *)s,bp,ccase))!=NOMATCH)
        {
          p=t=s; /* t is at least a partial match */
          if ((unique && res!=EXACT)) 
            {

-             while( (p = *kwds++) )
+             while( kwds && (p = *kwds++) )

                {
                  if ((res=Compare((unsigned char *)p,bp,ccase))!=NOMATCH)
                    {
                {
                  if ((res=Compare((unsigned char *)p,bp,ccase))!=NOMATCH)
                    {


@@ -218,18 +220,20 @@ static bool Next_Enum(FIELD * field, const void * argp)
   int cnt           = args->count;
   unsigned char *bp = (unsigned char *)field_buffer(field,0);
 
   int cnt           = args->count;
   unsigned char *bp = (unsigned char *)field_buffer(field,0);
 

-  while(cnt--)
-    {
-      if (Compare((unsigned char *)(*kwds++),bp,ccase)==EXACT) 
-       break;
-    }
-  if (cnt<=0)
-    kwds = args->kwds;
-  if ((cnt>=0) || (Compare((unsigned char *)dummy,bp,ccase)==EXACT))
-    {
-      set_field_buffer(field,0,*kwds);
-      return TRUE;
-    }
+  if (kwds) {
+    while(cnt--)
+      {
+       if (Compare((unsigned char *)(*kwds++),bp,ccase)==EXACT) 
+         break;
+      }
+    if (cnt<=0)
+      kwds = args->kwds;
+    if ((cnt>=0) || (Compare((const unsigned char *)dummy,bp,ccase)==EXACT))
+      {
+       set_field_buffer(field,0,*kwds);
+       return TRUE;
+      }
+  }

   return FALSE;
 }
 
   return FALSE;
 }
 


@@ -252,20 +256,22 @@ static bool Previous_Enum(FIELD * field, const void * argp)
   bool ccase    = args->checkcase;
   unsigned char *bp = (unsigned char *)field_buffer(field,0);
 
   bool ccase    = args->checkcase;
   unsigned char *bp = (unsigned char *)field_buffer(field,0);
 

-  while(cnt--)
-    {
-      if (Compare((unsigned char *)(*kwds--),bp,ccase)==EXACT) 
-       break;
-    }
-
-  if (cnt<=0)
-    kwds  = &args->kwds[args->count-1];
-
-  if ((cnt>=0) || (Compare((unsigned char *)dummy,bp,ccase)==EXACT))
-    {
-      set_field_buffer(field,0,*kwds);
-      return TRUE;
-    }
+  if (kwds) {
+    while(cnt--)
+      {
+       if (Compare((unsigned char *)(*kwds--),bp,ccase)==EXACT) 
+         break;
+      }
+    
+    if (cnt<=0)
+      kwds  = &args->kwds[args->count-1];
+    
+    if ((cnt>=0) || (Compare((const unsigned char *)dummy,bp,ccase)==EXACT))
+      {
+       set_field_buffer(field,0,*kwds);
+       return TRUE;
+      }
+  }

   return FALSE;
 }
 
   return FALSE;
 }