Changeset 76479 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

Dec 26, 2018 2:00:32 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

127780

Message:

dt_lex.l: Recent GCC versions seem to take exception to strncpy, so use RTStrCopy for populating yyintsuffix.

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_lex.l (modified) (3 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_lex.l

@@ -305 +305 @@
 #ifdef VBOX
                                 int rc;
+                                uint64_t uTmp = 0;
 #endif
                                 if (isdigit(v[0]))
@@ -314 +315 @@
                                 errno = 0;
                                 yylval.l_int = strtoull(v, &p, 0);
-#else
-                                {
-                                   uint64_t uTmp = 0;
-                                    rc = RTStrToUInt64Ex(v, &p, 0, &uTmp);
-                                    yylval.l_int = uTmp;
-                                }
-#endif
                                 (void) strncpy(yyintsuffix, p,
                                     sizeof (yyintsuffix));
                                 yyintdecimal = *v != '0';
-
-#ifndef VBOX
                                 if (errno == ERANGE)
 #else
+                                rc = RTStrToUInt64Ex(v, &p, 0, &uTmp);
+                                yylval.l_int = uTmp;
+                                RTStrCopy(yyintsuffix, sizeof(yyintsuffix), p);
+                                yyintdecimal = *v != '0';
                                 if (rc == VWRN_NUMBER_TOO_BIG || rc == VWRN_NEGATIVE_UNSIGNED)
 #endif
@@ -407 +403 @@
                         errno = 0;
                         yylval.l_int = strtoull(yytext, &p, 0);
+                        yyintprefix = 0;
+                        (void) strncpy(yyintsuffix, p, sizeof (yyintsuffix));
+                        yyintdecimal = yytext[0] != '0';
+                        if (errno == ERANGE)
 #else
                         uint64_t uTmp = 0;
                         int rc = RTStrToUInt64Ex(yytext, &p, 0, &uTmp);
                         yylval.l_int = uTmp;
-#endif
                         yyintprefix = 0;
-                        (void) strncpy(yyintsuffix, p, sizeof (yyintsuffix));
+                        RTStrCopy(yyintsuffix, sizeof(yyintsuffix), p);
                         yyintdecimal = yytext[0] != '0';
-
-#ifndef VBOX
-                        if (errno == ERANGE)
-#else
                         if (rc == VWRN_NUMBER_TOO_BIG || rc == VWRN_NEGATIVE_UNSIGNED)
 #endif