Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/ntp/dist/ntpd fix typo caused mdnstries not to ...



details:   https://anonhg.NetBSD.org/src/rev/422409b2da78
branches:  trunk
changeset: 759150:422409b2da78
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Nov 30 15:00:10 2010 +0000

description:
fix typo caused mdnstries not to work.

diffstat:

 external/bsd/ntp/dist/ntpd/ntp_parser.c |  912 ++++++++++++++++----------------
 external/bsd/ntp/dist/ntpd/ntp_parser.y |    6 +-
 2 files changed, 459 insertions(+), 459 deletions(-)

diffs (truncated from 2015 to 300 lines):

diff -r 21cb1419e0a1 -r 422409b2da78 external/bsd/ntp/dist/ntpd/ntp_parser.c
--- a/external/bsd/ntp/dist/ntpd/ntp_parser.c   Tue Nov 30 14:35:38 2010 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_parser.c   Tue Nov 30 15:00:10 2010 +0000
@@ -711,9 +711,9 @@
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  173
+#define YYFINAL  175
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   681
+#define YYLAST   680
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  169
@@ -788,8 +788,8 @@
       22,    24,    26,    28,    30,    32,    34,    36,    38,    40,
       44,    47,    49,    51,    53,    55,    57,    59,    62,    65,
       67,    70,    72,    74,    77,    79,    81,    84,    87,    90,
-      93,    95,    97,    99,   101,   103,   106,   109,   112,   115,
-     117,   119,   121,   124,   127,   130,   133,   136,   139,   142,
+      92,    94,    96,    98,   100,   103,   106,   109,   112,   114,
+     116,   118,   121,   124,   127,   130,   133,   136,   139,   142,
      145,   148,   151,   154,   156,   157,   160,   162,   165,   168,
      171,   174,   177,   180,   183,   186,   189,   191,   194,   197,
      200,   203,   206,   209,   212,   215,   218,   221,   224,   227,
@@ -823,10 +823,10 @@
      132,    -1,    58,   132,    -1,   132,    -1,   177,   178,    -1,
      178,    -1,     7,    -1,    12,   224,    -1,    16,    -1,    49,
       -1,    60,    53,    -1,    83,    53,    -1,    78,    53,    -1,
-      79,    53,    -1,    95,    -1,   111,    -1,   112,    -1,   141,
-      -1,   151,    -1,   143,    53,    -1,    85,    53,    -1,   147,
-      53,    -1,   180,   175,    -1,   145,    -1,   146,    -1,    14,
-      -1,    74,   222,    -1,    88,   222,    -1,     8,    53,    -1,
+      95,    -1,   111,    -1,   112,    -1,   141,    -1,   151,    -1,
+     143,    53,    -1,    85,    53,    -1,   147,    53,    -1,   180,
+     175,    -1,   145,    -1,   146,    -1,    14,    -1,    74,   222,
+      -1,    88,   222,    -1,    79,    53,    -1,     8,    53,    -1,
       22,    53,    -1,    23,   183,    -1,    61,   132,    -1,    62,
      132,    -1,   119,    53,    -1,   121,    53,    -1,   142,   220,
       -1,   101,   132,    -1,   184,    -1,    -1,   184,   185,    -1,
@@ -890,27 +890,27 @@
      323,   324,   325,   326,   327,   328,   329,   330,   331,   339,
      345,   354,   355,   356,   357,   358,   362,   363,   364,   368,
      372,   373,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   401,   409,
-     410,   420,   422,   424,   435,   437,   439,   444,   446,   448,
-     450,   452,   454,   459,   461,   465,   472,   482,   484,   486,
-     488,   490,   492,   494,   511,   516,   517,   521,   523,   525,
-     527,   529,   531,   533,   535,   537,   539,   549,   551,   560,
-     568,   569,   573,   574,   575,   576,   577,   578,   579,   580,
-     584,   591,   601,   611,   620,   629,   638,   639,   643,   644,
-     645,   646,   647,   648,   649,   658,   662,   667,   672,   685,
-     698,   707,   708,   713,   714,   715,   716,   717,   718,   719,
-     720,   721,   722,   723,   724,   725,   726,   730,   732,   737,
-     738,   739,   747,   752,   754,   759,   760,   761,   762,   763,
-     764,   765,   766,   774,   776,   781,   788,   798,   799,   800,
-     801,   802,   803,   804,   820,   824,   825,   829,   830,   831,
-     832,   833,   834,   835,   844,   845,   861,   867,   869,   871,
-     873,   875,   878,   880,   891,   893,   895,   905,   907,   909,
-     911,   913,   918,   920,   924,   928,   930,   935,   937,   941,
-     942,   946,   947,   951,   966,   971,   979,   980,   984,   985,
-     986,   987,   991,   992,   993,  1003,  1004,  1008,  1009,  1013,
-    1014,  1018,  1027,  1028,  1032,  1033,  1042,  1057,  1061,  1062,
-    1066,  1067,  1071,  1072,  1076,  1081,  1085,  1089,  1090,  1094,
-    1099,  1100,  1104,  1106,  1108,  1110,  1112
+     385,   386,   387,   388,   389,   390,   391,   400,   408,   409,
+     419,   421,   423,   425,   436,   438,   440,   445,   447,   449,
+     451,   453,   455,   460,   462,   466,   473,   483,   485,   487,
+     489,   491,   493,   495,   512,   517,   518,   522,   524,   526,
+     528,   530,   532,   534,   536,   538,   540,   550,   552,   561,
+     569,   570,   574,   575,   576,   577,   578,   579,   580,   581,
+     585,   592,   602,   612,   621,   630,   639,   640,   644,   645,
+     646,   647,   648,   649,   650,   659,   663,   668,   673,   686,
+     699,   708,   709,   714,   715,   716,   717,   718,   719,   720,
+     721,   722,   723,   724,   725,   726,   727,   731,   733,   738,
+     739,   740,   748,   753,   755,   760,   761,   762,   763,   764,
+     765,   766,   767,   775,   777,   782,   789,   799,   800,   801,
+     802,   803,   804,   805,   821,   825,   826,   830,   831,   832,
+     833,   834,   835,   836,   845,   846,   862,   868,   870,   872,
+     874,   876,   879,   881,   892,   894,   896,   906,   908,   910,
+     912,   914,   919,   921,   925,   929,   931,   936,   938,   942,
+     943,   947,   948,   952,   967,   972,   980,   981,   985,   986,
+     987,   988,   992,   993,   994,  1004,  1005,  1009,  1010,  1014,
+    1015,  1019,  1028,  1029,  1033,  1034,  1043,  1058,  1062,  1063,
+    1067,  1068,  1072,  1073,  1077,  1082,  1086,  1090,  1091,  1095,
+    1100,  1101,  1105,  1107,  1109,  1111,  1113
 };
 #endif
 
@@ -1005,8 +1005,8 @@
      172,   172,   172,   172,   172,   172,   172,   172,   172,   173,
      173,   174,   174,   174,   174,   174,   175,   175,   175,   176,
      177,   177,   178,   178,   178,   178,   178,   178,   178,   178,
-     178,   178,   178,   178,   178,   178,   178,   178,   179,   180,
-     180,   181,   181,   181,   182,   182,   182,   182,   182,   182,
+     178,   178,   178,   178,   178,   178,   178,   179,   180,   180,
+     181,   181,   181,   181,   182,   182,   182,   182,   182,   182,
      182,   182,   182,   183,   183,   184,   184,   185,   185,   185,
      185,   185,   185,   185,   186,   187,   187,   188,   188,   188,
      188,   188,   188,   188,   188,   188,   188,   189,   189,   189,
@@ -1034,9 +1034,9 @@
        0,     2,     1,     3,     2,     2,     0,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
        2,     1,     1,     1,     1,     1,     1,     2,     2,     1,
-       2,     1,     1,     2,     1,     1,     2,     2,     2,     2,
-       1,     1,     1,     1,     1,     2,     2,     2,     2,     1,
-       1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     1,     1,     2,     1,     1,     2,     2,     2,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     1,     1,
+       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     1,     0,     2,     1,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
@@ -1063,40 +1063,40 @@
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       0,     0,     0,    24,    51,     0,     0,     0,    64,     0,
+       0,     0,     0,    24,    50,     0,     0,     0,    64,     0,
        0,   194,     0,   176,     0,     0,     0,   206,     0,     0,
-       0,     0,     0,    25,     0,     0,   207,     0,    23,     0,
-       0,    22,     0,     0,     0,     0,     0,    21,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    49,    50,   227,
-       0,     2,     0,     7,     0,     8,     0,     9,    10,    13,
-      11,    12,    14,    15,    16,    17,   174,     0,    18,     0,
-       5,    54,   225,   224,   177,   178,    55,     0,     0,     0,
-       0,     0,     0,     0,    56,    63,    66,   157,   158,   159,
-     160,   161,   162,   163,   154,   156,     0,     0,     0,   115,
-     138,   192,   180,   153,    92,    93,    94,    95,    99,    96,
-      97,    98,     0,     0,     0,    29,     0,    26,     6,    57,
-      58,   181,   203,   184,   202,   183,   220,    52,    53,    62,
-     218,   185,   182,   191,    59,   121,     0,     0,   121,    26,
-      60,   186,     0,   187,    87,    91,    88,   179,     0,     0,
-       0,     0,     0,     0,     0,   164,   166,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    74,    76,   188,
-     216,    61,   190,     1,     0,     4,    20,    48,   214,   213,
-     212,     0,     0,    72,    67,    68,    69,    70,    73,    71,
-      65,   155,   139,   140,   141,   137,   193,   107,   106,     0,
-     104,   105,     0,    89,   101,    27,    28,     0,     0,     0,
-       0,     0,     0,     0,     0,   142,   144,   175,   201,   219,
-     217,   117,   121,   121,   116,     0,     0,    90,   167,   168,
-     169,   170,   171,   172,   173,   165,    86,    77,   223,   221,
-     222,    79,    78,    84,    82,    83,    81,    85,    80,    75,
-       0,     0,   189,   198,   215,     3,    32,     0,    34,    35,
-       0,     0,     0,     0,     0,    40,    41,    42,    43,     0,
-       0,    44,    19,    31,   208,   209,   210,   205,   211,   204,
-       0,     0,     0,     0,   102,   114,   110,   112,   108,   109,
-     111,   113,   103,   100,   149,   150,   151,   152,   148,   147,
-     145,   146,   143,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   132,   133,   134,   135,   136,   122,   118,   119,
-     121,   196,   200,   199,   197,    33,    36,    38,    39,    37,
-      46,    45,    47,    30,     0,     0,     0,     0,     0,   233,
+       0,     0,     0,    25,     0,     0,     0,   207,     0,    23,
+       0,     0,    22,     0,     0,     0,     0,     0,    21,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    48,    49,
+     227,     0,     2,     0,     7,     0,     8,     0,     9,    10,
+      13,    11,    12,    14,    15,    16,    17,   174,     0,    18,
+       0,     5,    54,   225,   224,   177,   178,    55,     0,     0,
+       0,     0,     0,     0,     0,    56,    63,    66,   157,   158,
+     159,   160,   161,   162,   163,   154,   156,     0,     0,     0,
+     115,   138,   192,   180,   153,    92,    93,    94,    95,    99,
+      96,    97,    98,     0,     0,     0,    29,     0,    26,     6,
+      57,    58,   181,   203,   184,   202,   183,   220,    51,    53,
+      52,    62,   218,   185,   182,   191,    59,   121,     0,     0,
+     121,    26,    60,   186,     0,   187,    87,    91,    88,   179,
+       0,     0,     0,     0,     0,     0,     0,   164,   166,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      76,   188,   216,    61,   190,     1,     0,     4,    20,    47,
+     214,   213,   212,     0,     0,    72,    67,    68,    69,    70,
+      73,    71,    65,   155,   139,   140,   141,   137,   193,   107,
+     106,     0,   104,   105,     0,    89,   101,    27,    28,     0,
+       0,     0,     0,     0,     0,     0,     0,   142,   144,   175,
+     201,   219,   217,   117,   121,   121,   116,     0,     0,    90,
+     167,   168,   169,   170,   171,   172,   173,   165,    86,    77,
+     223,   221,   222,    79,    78,    84,    82,    83,    81,    85,
+      80,    75,     0,     0,   189,   198,   215,     3,    32,     0,
+      34,    35,     0,     0,     0,     0,    39,    40,    41,    42,
+       0,     0,    43,    19,    31,   208,   209,   210,   205,   211,
+     204,     0,     0,     0,     0,   102,   114,   110,   112,   108,
+     109,   111,   113,   103,   100,   149,   150,   151,   152,   148,
+     147,   145,   146,   143,   123,   124,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   122,   118,
+     119,   121,   196,   200,   199,   197,    33,    36,    38,    37,
+      45,    44,    46,    30,     0,     0,     0,     0,     0,   233,
        0,   229,   120,   195,   230,   231,     0,   228,   226,   232,
        0,   236,     0,     0,     0,     0,     0,   238,     0,     0,
      234,   237,   235,     0,     0,     0,     0,     0,     0,     0,
@@ -1107,71 +1107,71 @@
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    50,    51,    52,    53,    54,   126,   117,   272,   273,
-      55,    56,    57,    58,    84,    85,    86,    59,   167,   168,
-      60,   144,   112,   203,   204,   292,    61,   221,   317,    99,
-     100,    62,   215,   216,    63,    94,    95,    64,   155,   156,
-      65,   102,   143,   252,   253,   123,   124,    66,    67,   279,
-     181,   171,   131,   127,   241,    74,    68,    69,   282,   283,
+      -1,    51,    52,    53,    54,    55,   127,   118,   273,   274,
+      56,    57,    58,    59,    85,    86,    87,    60,   169,   170,
+      61,   146,   113,   205,   206,   293,    62,   223,   318,   100,
+     101,    63,   217,   218,    64,    95,    96,    65,   157,   158,
+      66,   103,   145,   254,   255,   124,   125,    67,    68,   280,
+     183,   173,   133,   128,   243,    75,    69,    70,   283,   284,
      338,   339,   353,   340,   356,   357,   370,   371
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -175
+#define YYPACT_NINF -139
 static const yytype_int16 yypact[] =
 {
-     124,  -133,    -6,  -175,  -175,    -4,     5,     9,   113,     2,
-      -3,   -82,     2,  -175,    70,   -40,   -77,  -175,   -75,   -69,
-     -68,   -67,   -64,  -175,   -40,   -40,  -175,   -62,  -175,   -60,
-     -58,  -175,   -57,    14,   -17,    24,   -54,  -175,   -52,    70,
-     -51,    -4,    21,   570,   -50,    31,    31,  -175,  -175,  -175,
-      85,   292,   -66,  -175,   -40,  -175,   -40,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,  -175,  -175,  -175,   -20,  -175,   -76,
-    -175,  -175,  -175,  -175,  -175,  -175,  -175,   -39,   -36,   -35,
-     -34,   -32,    42,   -30,  -175,   113,  -175,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,     2,  -175,    50,    52,    53,    -3,
-    -175,    83,  -175,     2,  -175,  -175,  -175,  -175,  -175,  -175,
-    -175,  -175,   -14,    11,    13,  -175,   160,  -175,   428,  -175,
-    -175,  -175,  -175,   -67,  -175,  -175,  -175,   -40,   -40,  -175,
-    -175,    16,  -175,  -175,  -175,  -175,   -16,    -5,  -175,    51,
-    -175,  -175,   -38,  -175,    70,  -175,  -175,  -175,    -4,    -4,
-      -4,    -4,    -4,    -4,    -4,    21,  -175,    81,    91,    -8,
-     101,    -4,    -4,    -4,    -4,   102,   104,   570,  -175,   -37,
-    -175,   118,   118,  -175,   -19,  -175,   497,  -175,  -175,  -175,
-    -175,    -1,  -115,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,    45,
-    -175,  -175,    12,   -14,  -175,  -175,  -175,    -8,    -8,    -8,
-      -8,    47,   121,    -4,    -4,   160,  -175,  -175,  -175,  -175,
-    -175,   534,  -175,  -175,   534,   -50,    48,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
-     -50,   128,   -37,  -175,  -175,  -175,  -175,    -4,  -175,  -175,
-     129,   135,   137,   138,   142,  -175,  -175,  -175,  -175,   143,
-     151,  -175,   497,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
-      39,    40,   -98,    54,  -175,  -175,  -175,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,   534,   534,
-    -175,   182,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
-    -175,  -175,  -175,  -175,    -4,    -4,    44,    56,  -116,  -175,
-      57,  -175,   534,  -175,  -175,  -175,   -40,  -175,  -175,  -175,
-      55,  -175,    49,    71,    -4,    69,  -128,  -175,    63,    -4,
-    -175,  -175,  -175,    73,     4,    75,    76,    87,    88,    89,
-      58,    82,    -4,    -4,    -4,    -4,    -4,  -175,    94,  -175,
-    -175,  -175,  -175,  -175,  -175,  -175
+     125,  -122,   -36,  -139,  -139,   -15,   -16,   -13,   -19,     8,
+      -3,   -90,     8,  -139,    29,     5,   -85,  -139,   -81,   -77,
+     -72,   -70,   -63,  -139,     5,    18,     5,  -139,   -62,  -139,
+     -56,   -55,  -139,   -54,    28,   -17,    31,   -33,  -139,   -28,
+      29,   -27,   -15,     0,   569,   -14,    40,    40,  -139,  -139,
+    -139,    98,   291,   -23,  -139,     5,  -139,     5,  -139,  -139,
+    -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,    17,  -139,
+     -26,  -139,  -139,  -139,  -139,  -139,  -139,  -139,    12,    13,
+      20,    23,    24,    97,    35,  -139,   -19,  -139,  -139,  -139,
+    -139,  -139,  -139,  -139,  -139,     8,  -139,   112,   117,   119,
+      -3,  -139,   144,  -139,     8,  -139,  -139,  -139,  -139,  -139,
+    -139,  -139,  -139,    -8,    46,    48,  -139,    33,  -139,   427,
+    -139,  -139,  -139,  -139,   -70,  -139,  -139,  -139,     5,  -139,
+       5,  -139,  -139,    49,  -139,  -139,  -139,  -139,    -7,    -5,
+    -139,   101,  -139,  -139,    16,  -139,    29,  -139,  -139,  -139,
+     -15,   -15,   -15,   -15,   -15,   -15,   -15,     0,  -139,   131,
+     132,   -21,   135,   -15,   -15,   -15,   -15,   136,   138,   569,
+    -139,   -44,  -139,   139,   139,  -139,    41,  -139,   496,  -139,
+    -139,  -139,  -139,    -1,   -93,  -139,  -139,  -139,  -139,  -139,
+    -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,
+    -139,    65,  -139,  -139,     9,    -8,  -139,  -139,  -139,   -21,
+     -21,   -21,   -21,    78,   158,   -15,   -15,    33,  -139,  -139,
+    -139,  -139,  -139,   533,  -139,  -139,   533,   -14,    83,  -139,
+    -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,
+    -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,
+    -139,  -139,   -14,   163,   -44,  -139,  -139,  -139,  -139,   -15,
+    -139,  -139,   166,   167,   168,   169,  -139,  -139,  -139,  -139,
+     170,   171,  -139,   496,  -139,  -139,  -139,  -139,  -139,  -139,
+    -139,    59,    61,  -100,    73,  -139,  -139,  -139,  -139,  -139,
+    -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,
+    -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,
+    -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,  -139,   533,
+     533,  -139,   204,  -139,  -139,  -139,  -139,  -139,  -139,  -139,
+    -139,  -139,  -139,  -139,   -15,   -15,    66,    80,  -116,  -139,
+      69,  -139,   533,  -139,  -139,  -139,     5,  -139,  -139,  -139,
+      79,  -139,    71,    81,   -15,    76,  -125,  -139,    84,   -15,
+    -139,  -139,  -139,    85,   -73,    77,    88,    89,    90,    91,
+      44,    95,   -15,   -15,   -15,   -15,   -15,  -139,   103,  -139,
+    -139,  -139,  -139,  -139,  -139,  -139
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -175,  -175,  -175,   -47,  -175,  -175,   -10,   -33,  -175,   -21,
-    -175,  -175,  -175,  -175,  -175,  -175,   171,  -175,  -175,    90,
-    -175,  -175,    -9,  -175,    33,  -175,  -175,  -136,  -175,  -175,
-     161,  -175,  -175,    46,  -175,   247,   -65,  -175,  -175,   110,



Home | Main Index | Thread Index | Old Index