Dan Hipschman : widl: Remove redundant get_var_vt function.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e7495555a09e1c5631d7de77926a95bf3f551201
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e7495555a09e1c5631d7de77926a95bf3f551201

Author: Dan Hipschman <dsh at linux.ucla.edu>
Date:   Wed May  9 20:47:24 2007 -0700

widl: Remove redundant get_var_vt function.

---

 tools/widl/typelib.c    |   14 --------------
 tools/widl/typelib.h    |    1 -
 tools/widl/write_msft.c |    6 +++---
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c
index 1e63e96..3bdbcf3 100644
--- a/tools/widl/typelib.c
+++ b/tools/widl/typelib.c
@@ -212,20 +212,6 @@ unsigned short get_type_vt(type_t *t)
   return 0;
 }
 
-unsigned short get_var_vt(var_t *v)
-{
-  unsigned short vt;
-  const char *tname = v->type->name;
-
-  chat("get_var_vt: var %p type->name %s\n", v, tname ? tname : "NULL");
-  if (tname) {
-    vt = builtin_vt(tname);
-    if (vt) return vt;
-  }
-
-  return get_type_vt(v->type);
-}
-
 void start_typelib(char *name, attr_list_t *attrs)
 {
     in_typelib++;
diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h
index 126b66a..b17387d 100644
--- a/tools/widl/typelib.h
+++ b/tools/widl/typelib.h
@@ -82,7 +82,6 @@ enum VARENUM {
     VT_TYPEMASK = 0xfff
 };
 extern unsigned short get_type_vt(type_t *t);
-extern unsigned short get_var_vt(var_t *v);
 
 extern int create_msft_typelib(typelib_t *typelib);
 #endif
diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c
index 6916128..54affd9 100644
--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -1155,7 +1155,7 @@ static int encode_var(
     }
     dump_type(var->type);
 
-    vt = get_var_vt(var);
+    vt = get_type_vt(var->type);
     type = var->type;
     while(!vt) {
         if(type->ref == NULL) {
@@ -1445,7 +1445,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int
                 if (arg->type->type == RPC_FC_ENUM16)
                     vt = VT_INT;
                 else
-                    vt = get_var_vt(arg);
+                    vt = get_type_vt(arg->type);
                 paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */
                 chat("default value %ld\n", expr->cval);
                 write_value(typeinfo->typelib, defaultdata, vt, &expr->cval);
@@ -1458,7 +1458,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int
                 if (arg->type->type == RPC_FC_ENUM16)
                   vt = VT_INT;
                 else
-                  vt = get_var_vt(arg);
+                  vt = get_type_vt(arg->type);
                 paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */
                 chat("default value '%s'\n", s);
                 write_value(typeinfo->typelib, defaultdata, vt, s);