← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_cache.c

  • Committer: Brian Aker
  • Date: 2008-10-06 06:47:29 UTC
  • Revision ID: brian@tangent.org-20081006064729-2i9mhjkzyvow9xsm
Remove uint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_cache.c
17
17
 
18
18
#include "mysys_priv.h"
19
19
#include <mystrings/m_string.h>
20
 
#include <mysys/my_static.h>
21
 
#include <mysys/mysys_err.h>
22
 
#include <mysys/iocache.h>
23
 
 
 
20
#include "my_static.h"
 
21
#include "mysys_err.h"
 
22
 
 
23
        /*
 
24
          Remove an open tempfile so that it doesn't survive
 
25
          if we crash;  If the operating system doesn't support
 
26
          this, just remember the file name for later removal
 
27
        */
 
28
 
 
29
static bool cache_remove_open_tmp(IO_CACHE *cache __attribute__((unused)),
 
30
                                     const char *name)
 
31
{
 
32
#if O_TEMPORARY == 0
 
33
#if !defined(CANT_DELETE_OPEN_FILES)
 
34
  /* The following should always succeed */
 
35
  (void) my_delete(name,MYF(MY_WME | ME_NOINPUT));
 
36
#else
 
37
  int length;
 
38
  if (!(cache->file_name=
 
39
        (char*) my_malloc((length=strlen(name)+1),MYF(MY_WME))))
 
40
  {
 
41
    my_close(cache->file,MYF(0));
 
42
    cache->file = -1;
 
43
    errno=my_errno=ENOMEM;
 
44
    return 1;
 
45
  }
 
46
  memcpy(cache->file_name,name,length);
 
47
#endif
 
48
#endif /* O_TEMPORARY == 0 */
 
49
  return 0;
 
50
}
24
51
 
25
52
        /*
26
53
        ** Open tempfile cached by IO_CACHE
55
82
  char name_buff[FN_REFLEN];
56
83
  int error=1;
57
84
  if ((cache->file=create_temp_file(name_buff, cache->dir, cache->prefix,
58
 
                                    (O_RDWR | O_TRUNC),
 
85
                                    (O_RDWR | O_BINARY | O_TRUNC |
 
86
                                     O_TEMPORARY | O_SHORT_LIVED),
59
87
                                    MYF(MY_WME))) >= 0)
60
88
  {
61
89
    error=0;
62
 
    my_delete(name_buff,MYF(MY_WME | ME_NOINPUT));
 
90
    cache_remove_open_tmp(cache, name_buff);
63
91
  }
64
92
  return(error);
65
93
}