2 files changed, 2 insertions, 4 deletions
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 7714c0e67f..7c2b50c2e5 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -850,9 +850,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 
   /* Lock stream.  */
   __libc_cleanup_region_start ((void (*) (void *)) &__funlockfile, s);
-
-  if (__flockfile != NULL)
-    __flockfile (s);
+  __flockfile (s);
 
   /* Write the literal text before the first format.  */
   outstring ((const UCHAR_T *) format,
diff --git a/stdio-common/xbug.c b/stdio-common/xbug.c
index fc60c66be9..7ab76f051a 100644
--- a/stdio-common/xbug.c
+++ b/stdio-common/xbug.c
@@ -54,7 +54,7 @@ void ReadFile(buffer, input)
 int
 main(int argc, char *argv[])
 {
-  char * filename = "xbug.c";
+  char filename[] = "xbug.c";
   FILE *input;
   Buffer buffer;