Changeset 142 for trunk


Ignore:
Timestamp:
Nov 27, 2005, 10:38:41 PM (13 years ago)
Author:
bcornec
Message:

merge -r139:141 $SVN_M/branches/2.05
splint improvements (begin)

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/common/libmondo-fifo.c

    r45 r142  
    99#include <unistd.h>
    1010#include <stdio.h>
     11#ifndef S_SPLINT_S
    1112#include <signal.h>
     13#endif
    1214#include <fcntl.h>
    1315#include <stdio.h>
     
    2022#include <sys/sem.h>
    2123#include <sys/wait.h>
     24#ifndef S_SPLINT_S
    2225#include <pthread.h>
     26#endif
    2327
    2428#include "my-stuff.h"
  • trunk/mondo/mondo/common/libmondo-files.c

    r127 r142  
    12331233    }
    12341234    fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
    1235     fprintf(fout, "ifconfig %s %s; # config client\n", nfs_dev,
     1235    fprintf(fout, "ifconfig %s %s # config client\n", nfs_dev,
    12361236            nfs_client_ipaddr);
    1237     fprintf(fout, "ping -c 1 %s; # ping server\n", nfs_server_ipaddr);
     1237    fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
    12381238    fprintf(fout, "mount -t nfs -o nolock %s /tmp/isodir\n",
    12391239            bkpinfo->nfs_mount);
  • trunk/mondo/mondo/common/my-stuff.h

    r127 r142  
    6161#include <time.h>
    6262#include <unistd.h>
     63#ifndef S_SPLINT_S
    6364#include <signal.h>
     65#endif
    6466//#include <curses.h>
    6567#include <newt.h>
    6668#include <ctype.h>
    6769#include <string.h>
     70#ifndef S_SPLINT_S
    6871#include <pthread.h>
     72#endif
    6973#include <assert.h>
    7074
     
    338342#define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
    339343#define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
    340 #define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs dos minix coda nfs ntfs hpfs raid lvm"
     344#define SANE_FORMATS        "swap image vfat ext2 ext3 xfs vfs jfs reiserfs dos minix coda nfs ntfs hpfs raid lvm cifs"
    341345#define ALT_TAPE        "/dev/ht0"
    342346#define MKE2FS_OR_NEWFS "mke2fs"
  • trunk/mondo/mondo/mondoarchive/main.c

    r94 r142  
    108108
    109109/************************* #include statements *************************/
     110#ifndef S_SPLINT_S
    110111#include <pthread.h>
     112#endif
    111113//#include <config.h>
    112114//#include "../../config.h"
  • trunk/mondo/mondo/mondoarchive/mondo-cli.c

    r107 r142  
    165165#include "mondo-cli-EXT.h"
    166166#include "../common/libmondo.h"
     167#ifndef S_SPLINT_S
    167168#include <pthread.h>
     169#endif
    168170
    169171#ifndef VERSION
  • trunk/mondo/mondo/mondorestore/mondo-restore.c

    r118 r142  
    388388#include "mondo-rstr-compare-EXT.h"
    389389#include "mondo-rstr-tools-EXT.h"
     390#ifndef S_SPLINT_S
    390391#include <pthread.h>
     392#endif
    391393
    392394extern void success_message(void);
  • trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

    r87 r142  
    6363#include "mondo-restore-EXT.h"
    6464#include "mondo-rstr-tools-EXT.h"
     65#ifndef S_SPLINT_S
    6566#include <pthread.h>
     67#endif
    6668
    6769//static char cvsid[] = "$Id$";
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r127 r142  
    131131//#include "mondo-rstr-compare-EXT.h"
    132132#include "mondo-rstr-tools.h"
     133#ifndef S_SPLINT_S
    133134#include <pthread.h>
     135#endif
    134136
    135137extern bool g_sigpipe_caught;
  • trunk/tools/quality

    r121 r142  
    4646echo " "
    4747echo "Splint: "
    48 find . -name '*.c' -o -name '*.h' | xargs splint +posixlib -Dlinux
     48find . -name '*.c' -o -name '*.h' | xargs splint +gnuextensions +posixlib -Dlinux
    4949
    5050rm -f /tmp/mondo.quality
Note: See TracChangeset for help on using the changeset viewer.