Changeset 143 for Mulberry/trunk/Sources_Common/Calendar_Store/Clients/CLocalCalendarClient.cpp

Timestamp:

11/20/07 23:45:14 (1 year ago)

Author:

daboo

Message:

Merge of win32-merge branch.

Files:

• Mulberry/trunk/Sources_Common/Calendar_Store/Clients/CLocalCalendarClient.cpp (modified) (7 diffs)

Mulberry/trunk/Sources_Common/Calendar_Store/Clients/CLocalCalendarClient.cpp

@@ -263 +263 @@
                 if (__mkdir(fpath, S_IRWXU))
                 {
-                        int _errno = os_errno;
+                        int my_errno = os_errno;
                         //throw CGeneralException(_errno, "Could not create directory");
-                        throw CGeneralException(_errno);
+                        throw CGeneralException(my_errno);
                 }
         }
@@ -275 +275 @@
                 else
                 {
-                        int _errno = os_errno;
+                        int my_errno = os_errno;
                         //throw CGeneralException(_errno, "Could not create calendar file");
-                        throw CGeneralException(_errno);
+                        throw CGeneralException(my_errno);
                 }
                 
@@ -320 +320 @@
                 if (::delete_dir(fpath) != 0)
                 {
-                        int _errno = os_errno;
+                        int my_errno = os_errno;
                         //throw CGeneralException(_errno, "Could not delete directory");
-                        throw CGeneralException(_errno);
+                        throw CGeneralException(my_errno);
                 }
         }
@@ -336 +336 @@
                 if (::remove_utf8(fpath) != 0)
                 {
-                        int _errno = os_errno;
+                        int my_errno = os_errno;
                         //throw CGeneralException(_errno, "Could not delete calendar file");
-                        throw CGeneralException(_errno);
+                        throw CGeneralException(my_errno);
                 }
                 
@@ -383 +383 @@
                 if (::rename_utf8(fpath_old, fpath_new) != 0)
                 {
-                        int _errno = os_errno;
+                        int my_errno = os_errno;
                         //throw CGeneralException(_errno, "Could not rename directory");
-                        throw CGeneralException(_errno);
+                        throw CGeneralException(my_errno);
                 }
         }
@@ -406 +406 @@
                 if (::rename_utf8(fpath_old, fpath_new) != 0)
                 {
-                        int _errno = os_errno;
+                        int my_errno = os_errno;
                         //throw CGeneralException(_errno, "Could not rename calendar file");
-                        throw CGeneralException(_errno);
+                        throw CGeneralException(my_errno);
                 }
                 
@@ -498 +498 @@
                 if (::stat_utf8(fpath, &finfo))
                 {
-                        int err_no = os_errno;
-                        CLOG_LOGTHROW(CGeneralException, err_no);
-                        throw CGeneralException(err_no);
+                        int my_errno = os_errno;
+                        CLOG_LOGTHROW(CGeneralException, my_errno);
+                        throw CGeneralException(my_errno);
                 }
                 else