dthelp: Change to ANSI function definitions

[oweals/cde.git] / cde / programs / dtmail / dtmail / AttachArea.C

diff --git a/cde/programs/dtmail/dtmail/AttachArea.C b/cde/programs/dtmail/dtmail/AttachArea.C
index 7f1c21ea6a738767c890a3e3efdbe86199f7f201..c22e4011f3d573aa4fc8a0e502916dfe7c34fd39 100644 (file)
--- a/cde/programs/dtmail/dtmail/AttachArea.C
+++ b/cde/programs/dtmail/dtmail/AttachArea.C
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -47,9 +47,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#if defined(USL) || defined(__uxp__)
-#define S_ISSOCK(mode) ((mode & S_IFMT) == S_IFSOCK)
-#endif
 #include <stdio.h>
 #include <Dt/Editor.h>
 #include <Xm/ColorObjP.h>
@@ -162,6 +159,38 @@ AttachArea::AttachArea (
     _attach_area_selection_state = AA_SEL_NONE;
     _cache_single_attachment = NULL;
 
+    _no_selected_label = NULL;
+    _selected_label = NULL;
+    rowOfAttachmentsStatus = NULL;
+    _attachments_status = NULL;
+    _attachments_summary = NULL;
+    _mailbox = NULL;
+    _attachAreaWidth = 0;
+    _attachAreaHeight = 0;
+    _rc = NULL;
+    _sw = NULL;
+    _vsb = NULL;
+    _message = NULL;
+    _clipWindow = NULL;
+    _open = NULL;
+    _saveas = NULL;
+    _selectall = NULL;
+    _unselectall = NULL;
+    _menuBar = NULL;
+    _background = 0;
+    _foreground = 0;
+    _appBackground = 0;
+    _appForeground = 0;
+    _fileCmdList = NULL;
+    _editCmdList = NULL;
+    _size_selected_label = NULL;
+    _format_button = NULL;
+    _descriptionDialog = NULL;
+    _no_attachments_label = NULL;
+    _attachments_label = NULL;
+    _size_attachments_label = NULL;
+    
+    
 }
 
 void
@@ -646,14 +675,7 @@ AttachArea::addAttachment(
                                    (page_size - (s.st_size % page_size)));
     char * map;
 
-#if defined(__osf__)
-    // This version of mmap does NOT allow requested length to be
-    // greater than the file size ...  in contradiction to the
-    // documentation (don't round up).
-    map = (char *) mmap(0, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-#else
     map = (char *) mmap(0, map_size, PROT_READ, MAP_PRIVATE, fd, 0);
-#endif
 
     if (map == (char *)-1) {
        // We could not map it for some reason. Let's just read it into
@@ -663,7 +685,7 @@ AttachArea::addAttachment(
        buffer = new char[s.st_size + 1];
 
        if (!buffer) {
-           sprintf(buf, 
+            sprintf(buf, "%s",
                    GETMSG(DT_catd, 3, 36, "Unable to allocate memory."));
             helpId = DTMAILHELPNOALLOCMEM;
            answer = this->handleErrorDialog(GETMSG(DT_catd, 1, 83, "Mailer"), 
@@ -674,6 +696,9 @@ AttachArea::addAttachment(
 
        if (read(fd, buffer, (unsigned int) s.st_size) < 0) {
            SafeClose(fd);
+           delete [] buf;
+           delete [] buffer;
+           delete [] errormsg;
            return(NULL);
        }
        buffer[s.st_size] = 0;
@@ -1471,7 +1496,7 @@ AttachArea::undeleteLastDeletedAttachment(
 
     Attachment *tmpAttachment;
     Attachment **list;
-    time_t time_deleted = NULL, tmpTime = NULL;
+    time_t time_deleted = 0, tmpTime = 0;
     int i;
 
     if (_deleteCount == 0) {