rpms/gsoap/devel unused_args.patch,1.1,1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32671

Modified Files:
	unused_args.patch 
Log Message:
Fix up merge from F-11

unused_args.patch:
 symbol2.c  |    7 ++++++-
 symbol2.c~ |only
 2 files changed, 6 insertions(+), 1 deletion(-)

Index: unused_args.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/unused_args.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- unused_args.patch	7 Jan 2009 05:54:42 -0000	1.1
+++ unused_args.patch	18 Sep 2009 06:01:07 -0000	1.2
@@ -1,48 +1,33 @@
---- gsoap-2.7/gsoap/src/symbol2.c	2008-10-02 12:36:22.000000000 -0500
-+++ gsoap-2.7mf/gsoap/src/symbol2.c	2008-12-25 09:14:14.000000000 -0600
-@@ -6127,7 +6127,7 @@
- }
- 
- /* c_type_id returns the arraytype to be used in parameter declaration
--   Allows you to specify the identifier that acts acts as teh name of teh
-+   Allows you to specify the identifier that acts acts as the name of the
-    type of array */
- char *
- c_type_id(Tnode *typ, char *name)
-@@ -7278,6 +7278,7 @@
-   fprintf(fout,"\n\nSOAP_FMAC5 void SOAP_FMAC6 soap_delete_%s(struct soap *soap, %s)\n{\tsoap_delete(soap, p);\n}", c_ident(typ), c_type_id(typ, "*p"));
+diff -rup gsoap-2.7/gsoap/src/symbol2.c gsoap-2.7mf/gsoap/src/symbol2.c
+--- gsoap-2.7/gsoap/src/symbol2.c	2009-03-21 16:24:34.000000000 -0500
++++ gsoap-2.7mf/gsoap/src/symbol2.c	2009-05-11 10:18:32.000000000 -0500
+@@ -7334,6 +7334,7 @@ soap_instantiate_class(Tnode *typ)
+   fprintf(fhead,"\nSOAP_FMAC3 %s * SOAP_FMAC4 soap_instantiate_%s(struct soap*, int, const char*, const char*, size_t*);", c_type(typ), c_ident(typ));
    fprintf(fout,"\n\nSOAP_FMAC3 %s * SOAP_FMAC4 soap_instantiate_%s(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)", c_type(typ), c_ident(typ));
    fprintf(fout,"\n{");
 +  fprintf(fout,"\n\t(void)type; (void)arrayType; /* appease -Wall -Werror */");
    fprintf(fout, "\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"soap_instantiate_%s(%%d, %%s, %%s)\\n\", n, type?type:\"\", arrayType?arrayType:\"\"));", c_ident(typ));
  
    fprintf(fout,"\n\tstruct soap_clist *cp = soap_link(soap, NULL, %s, n, soap_fdelete);", soap_type(typ));
-@@ -7347,7 +7348,7 @@
-   fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap*, int, int, void*, size_t, const void*, size_t);", c_ident(typ));
-   /* fprintf(fhead,"\n#ifdef __cplusplus\n}\n#endif"); */
-   /* fprintf(fout,"\n\n#ifdef __cplusplus\nextern \"C\" {\n#endif"); */
--  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)", c_ident(typ));
-+  fprintf(fout,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_copy_%s(struct soap */*soap*/, int /*st*/, int /*tt*/, void *p, size_t /*len*/, const void *q, size_t /*n*/)", c_ident(typ));
-   fprintf(fout,"\n{");
-   fprintf(fout,"\n\tDBGLOG(TEST, SOAP_MESSAGE(fdebug, \"Copying %s %%p -> %%p\\n\", q, p));", c_type(typ));
-   fprintf(fout,"\n\t*(%s*)p = *(%s*)q;\n}", c_type(typ), c_type(typ));
-@@ -7809,6 +7810,7 @@
-     { if (is_external(typ))
-         return;
+@@ -7867,6 +7868,8 @@ Tnode* typ;
          fprintf(fout,"\n\nvoid %s::soap_default(struct soap *soap)\n{", c_ident(typ)); 
-+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
          if ((s = has_soapref(typ)))
            fprintf(fout,"\n\tthis->%s = soap;", s);
++         else
++           fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
  	d = get_Darraydims(typ);
-@@ -7836,6 +7838,7 @@
- 	}
-         fprintf(fhead,"\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap*, %s);",c_ident(typ),c_type_id(typ, "*")); 
+         if (d)
+ 	{ fprintf(fout,"\n\tthis->%s = NULL;", ident(p->sym->name));
+@@ -7894,6 +7897,8 @@ Tnode* typ;
          fprintf(fout,"\n\nSOAP_FMAC3 void SOAP_FMAC4 soap_default_%s(struct soap *soap, %s)\n{", c_ident(typ),c_type_id(typ, "*a")); 
-+		fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
          if ((s = has_soapref(typ)))
            fprintf(fout,"\n\ta->%s = soap;", s);
++         else
++           fprintf(fout,"\n\t(void)soap; /* appease -Wall -Werror */");
  	d = get_Darraydims(typ);
-@@ -9054,7 +9057,7 @@
+         if (d)
+ 	{ fprintf(fout,"\n\ta->%s = NULL;", ident(p->sym->name));
+@@ -9123,7 +9128,7 @@ soap_out(Tnode *typ)
        if (is_typedef(typ))
          fprintf(fout, "\n{\treturn soap_%s2s(soap, n);\n}", t_ident(typ));
        else if (is_boolean(typ))
@@ -51,3 +36,4 @@
        else if (!is_mask(typ))
        { fprintf(fout, "\n{\tconst char *s = soap_code_str(soap_codes_%s, (long)n);", c_ident(typ));
          fprintf(fout, "\n\tif (s)\n\t\treturn s;");
+Only in gsoap-2.7mf/gsoap/src: symbol2.c~