Changes in trunk/src/slib.c [29:20]

File:

• trunk/src/slib.c (modified) (13 diffs)

trunk/src/slib.c

@@ -231 +231 @@
   if (flag == 1)
     {
-      sl_snprintf    (val, 81, _("\n---------  %10s "), file);
+      sprintf        (val, _("\n---------  %10s "), file);
       sl_strlcpy     (msg,    val,   80);
-      sl_snprintf    (val, 81, _(" --- %6d ---------\n"), line);
+      sprintf        (val, _(" --- %6d ---------\n"), line);
       sl_strlcat     (msg,     val,   80);
       sh_log_console (msg);
@@ -577 +577 @@
 
 #if !defined(HOST_IS_I86SOLARIS)
-#if !defined (_GNU_SOURCE) && !defined(__linux__)
-/* flawfinder: ignore */
+#if !defined (_GNU_SOURCE)
 extern int vsnprintf ( char *str, size_t n,
                        const char *format, va_list ap );
@@ -778 +777 @@
 
 #if defined(HAVE_VSNPRINTF) && !defined(HAVE_BROKEN_VSNPRINTF)
-  len = vsnprintf (str, n, format, vl);                /* flawfinder: ignore */
+  len = vsnprintf (str, n, format, vl);
   str[n-1] = '\0';
 #else
-  VA_COPY (vl2, vl);                     /* save the argument list           */
+  VA_COPY (vl2, vl);                   /* save the argument list           */
   total = sl_printf_count (format, vl);
-  len = (int) total;
+  len   = (int) total;
   if (total < n) 
     {
-      /* flawfinder: ignore */
       vsprintf (str, format, vl2);       /* program has checked that it fits */
       str[n-1] = '\0';
@@ -806 +804 @@
  * ENULL:  src || format == NULL
  * ERANGE: n out of range
- * ETRUNC: truncated (unimplemented)
+ * ETRUNC: truncated
  */
 int sl_snprintf(char *str, size_t n,
@@ -823 +821 @@
   va_start (vl, format);
 #if defined(HAVE_VSNPRINTF) && !defined(HAVE_BROKEN_VSNPRINTF)
-  /* flawfinder: ignore */
   vsnprintf (str, n, format, vl);
   str[n-1] = '\0';
@@ -831 +828 @@
   if (total < n) 
     {
-      /* flawfinder: ignore */
       vsprintf (str, format, vl2);     /* program has checked that it fits */
       str[n-1] = '\0';
@@ -1572 +1568 @@
 SL_TICKET sl_make_ticket (int fd, char * filename)
 {
-  size_t    len;
   SL_TICKET ticket;
   SL_ENTER(_("sl_make_ticket"));
@@ -1592 +1587 @@
     }
 
-  len = sl_strlen(filename)+1;
-
-  if ( (ofiles[fd]->path = (char *) malloc(len) ) == NULL)
+   if ( (ofiles[fd]->path = (char *) malloc( strlen(filename)+1) ) == NULL)
     {
       free(ofiles[fd]);
@@ -1612 +1605 @@
     }
 
-  sl_strlcpy (ofiles[fd]->path, filename, len);
+  strcpy (ofiles[fd]->path, filename);                    /* Known to fit  */
   ofiles[fd]->ticket = ticket;
   ofiles[fd]->fd     = fd;
@@ -1653 +1646 @@
   int           fd;
   int           sflags;
-  size_t        len;
   SL_TICKET     ticket;
  
@@ -1828 +1820 @@
     }
 
-  len = sl_strlen(filename)+1;
-
-  if ( (ofiles[fd]->path = (char *) malloc(len) ) == NULL)
+   if ( (ofiles[fd]->path = (char *) malloc( strlen(filename)+1) ) == NULL)
     {
       free(ofiles[fd]);
@@ -1850 +1840 @@
     }
 
-  sl_strlcpy (ofiles[fd]->path, filename, len);
+  strcpy (ofiles[fd]->path, filename);                    /* Known to fit  */
   ofiles[fd]->ticket = ticket;
   ofiles[fd]->fd     = fd;
@@ -1984 +1974 @@
     {
       TPT((0, FIL__, __LINE__, 
-           _("msg=<Error closing file.>, path=<%s>, fd=<%d>, err=<%s>\n"), 
-           ofiles[fd]->path, fd, strerror(errno)));
+           _("msg=<Error closing file.>, path=<%s>, fd=<%d>\n"), 
+           ofiles[fd]->path, fd));
     }