Author: brad Date: 2005-07-26 02:48:29 +0000 (Tue, 26 Jul 2005) New Revision: 8769
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8769 Log: merging latest changes Modified: branches/SOC/SAMBA_4_0/SAMBA_4_0/source/heimdal/lib/asn1/parse.c branches/SOC/SAMBA_4_0/SAMBA_4_0/source/heimdal/lib/asn1/parse.h branches/SOC/SAMBA_4_0/SAMBA_4_0/source/torture/rpc/dssync.c Changeset: Modified: branches/SOC/SAMBA_4_0/SAMBA_4_0/source/heimdal/lib/asn1/parse.c =================================================================== --- branches/SOC/SAMBA_4_0/SAMBA_4_0/source/heimdal/lib/asn1/parse.c 2005-07-26 02:01:15 UTC (rev 8768) +++ branches/SOC/SAMBA_4_0/SAMBA_4_0/source/heimdal/lib/asn1/parse.c 2005-07-26 02:48:29 UTC (rev 8769) @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875d. */ +/* A Bison parser, made by GNU Bison 1.875c. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -222,7 +222,7 @@ /* A type that is properly aligned for any stack member. */ union yyalloc { - short int yyss; + short yyss; YYSTYPE yyvs; }; @@ -232,7 +232,7 @@ /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do @@ -274,7 +274,7 @@ #if defined (__STDC__) || defined (__cplusplus) typedef signed char yysigned_char; #else - typedef short int yysigned_char; + typedef short yysigned_char; #endif /* YYFINAL -- State number of the termination state. */ @@ -398,7 +398,7 @@ # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short int yytoknum[] = +static const unsigned short yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -638,12 +638,12 @@ #if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (short int *bottom, short int *top) +yy_stack_print (short *bottom, short *top) #else static void yy_stack_print (bottom, top) - short int *bottom; - short int *top; + short *bottom; + short *top; #endif { YYFPRINTF (stderr, "Stack now"); @@ -910,9 +910,9 @@ to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - register short int *yyssp; + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; + register short *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -949,7 +949,6 @@ yyssp = yyss; yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -975,7 +974,7 @@ these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short int *yyss1 = yyss; + short *yyss1 = yyss; /* Each stack pointer address is followed by the size of the @@ -1003,7 +1002,7 @@ yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + short *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1426,8 +1425,8 @@ } -/* Line 1010 of yacc.c. */ -#line 1431 "$base.c" +/* Line 1000 of yacc.c. */ +#line 1430 "$base.c" yyvsp -= yylen; yyssp -= yylen; Modified: branches/SOC/SAMBA_4_0/SAMBA_4_0/source/heimdal/lib/asn1/parse.h =================================================================== --- branches/SOC/SAMBA_4_0/SAMBA_4_0/source/heimdal/lib/asn1/parse.h 2005-07-26 02:01:15 UTC (rev 8768) +++ branches/SOC/SAMBA_4_0/SAMBA_4_0/source/heimdal/lib/asn1/parse.h 2005-07-26 02:48:29 UTC (rev 8769) @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875d. */ +/* A Bison parser, made by GNU Bison 1.875c. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -102,7 +102,7 @@ Member *member; char *defval; } YYSTYPE; -/* Line 1285 of yacc.c. */ +/* Line 1275 of yacc.c. */ #line 107 "parse.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 Modified: branches/SOC/SAMBA_4_0/SAMBA_4_0/source/torture/rpc/dssync.c =================================================================== --- branches/SOC/SAMBA_4_0/SAMBA_4_0/source/torture/rpc/dssync.c 2005-07-26 02:01:15 UTC (rev 8768) +++ branches/SOC/SAMBA_4_0/SAMBA_4_0/source/torture/rpc/dssync.c 2005-07-26 02:48:29 UTC (rev 8769) @@ -131,7 +131,6 @@ struct ldb_ldif *ldb_req; int rtn; - // * BOOL rtn_status = False; rtn = ldb_connect(ldb_ctx,ctx->ldap_url,0,NULL); if (rtn != 0) { printf("test_destroy_context(): ldb_connect() failed: %s.\n",