openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File dar.diff of Package dar (Revision 94c249514ed8a5bc4787bff10b506fe3)

Currently displaying revision 94c249514ed8a5bc4787bff10b506fe3 , Show latest

--- configure.ac
+++ configure.ac	2007/07/06 10:44:08
@@ -8,7 +8,7 @@
 
 AM_INIT_AUTOMAKE
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION
+AM_GNU_GETTEXT_VERSION(0.14.3)
 AM_ICONV
 
 # Checks for programs.
--- src/dar_suite/command_line.cpp
+++ src/dar_suite/command_line.cpp	2007/07/06 10:44:08
@@ -836,7 +836,7 @@
                     throw Erange("get_args", tools_printf(gettext(MISSING_ARG), char(lu)));
                 if(filename != "" || sauv_root != NULL)
                     throw Erange("get_args", gettext(" Only one option of -c -d -t -l -C -x or -+ is allowed"));
-                if(optarg != "")
+                if(strlen(optarg))
                     tools_split_path_basename(optarg, sauv_root, filename);
                 else
                     throw Erange("get_args", tools_printf(gettext(INVALID_ARG), char(lu)));
--- src/dar_suite/dar_cp.cpp
+++ src/dar_suite/dar_cp.cpp	2007/07/06 10:44:08
@@ -92,7 +92,7 @@
         ret = EXIT_OK;
     }
     else
-	if(argc != 3 || argv[1] == "-h")
+	if(argc != 3 || !strcmp(argv[1],"-h"))
 	{
 	    show_usage(dialog, argv[0]);
 	    ret = EXIT_SYNTAX;
--- src/dar_suite/dar_suite.cpp
+++ src/dar_suite/dar_suite.cpp	2007/07/06 10:44:08
@@ -96,7 +96,7 @@
 	// gettext settings
     try
     {
-	if(DAR_LOCALEDIR != "")
+	if(strlen(DAR_LOCALEDIR))
 	    if(bindtextdomain(PACKAGE, DAR_LOCALEDIR) == NULL)
 		throw Erange("", "Cannot open the translated messages directory, native language support will not work");
 	if(setlocale(LC_MESSAGES, "") == NULL || setlocale(LC_CTYPE, "") == NULL)
--- src/dar_suite/dar_xform.cpp
+++ src/dar_suite/dar_xform.cpp	2007/07/06 10:44:08
@@ -356,7 +356,7 @@
             dialog.warning(gettext("Too many argument on command line, see -h option for help"));
             return false;
         }
-        if(argv[optind] != "")
+        if(strlen(argv[optind]))
 	{
             tools_split_path_basename(argv[optind], src_dir, src);
 	    tools_check_basename(dialog, *src_dir, src, EXTENSION);
@@ -366,7 +366,7 @@
             dialog.warning(gettext("Invalid argument as source archive"));
             return false;
         }
-        if(argv[optind+1] != "")
+        if(strlen(argv[optind+1]))
             tools_split_path_basename(argv[optind+1], dst_dir, dst);
         else
         {
--- src/testing/test_libdar.cpp
+++ src/testing/test_libdar.cpp	2007/07/06 10:44:08
@@ -101,7 +101,7 @@
     {
 	try
 	{
-	    printf("[%d]%s\n", (U_I)context, ptr);
+	    printf("[%d]%s\n", (long)context, ptr);
 	}
 	catch(...)
 	{
@@ -130,7 +130,7 @@
 	{
 	    char r;
 
-	    printf("[%d]%s\n", (U_I)context, ptr);
+	    printf("[%d]%s\n", (long)context, ptr);
 	    scanf("%c", &r);
 	    rep = r == 'y';
 	}
@@ -161,7 +161,7 @@
 	     bool has_children,
 	     void *context)
 {
-    ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
+    ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (long)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children");
 }
 
 void f2()

Places

File dar.diff of Package dar (Revision 94c249514ed8a5bc4787bff10b506fe3)

Places