← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to mysys/my_fstream.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_fstream.c
46
46
{
47
47
  size_t readbytes;
48
48
  DBUG_ENTER("my_fread");
49
 
  DBUG_PRINT("my",("stream: 0x%lx  Buffer: 0x%lx  Count: %u  MyFlags: %d",
50
 
                   (long) stream, (long) Buffer, (uint) Count, MyFlags));
 
49
  DBUG_PRINT("my",("stream: %p  Buffer: %p  Count: %u  MyFlags: %d",
 
50
                   stream, Buffer, (uint) Count, MyFlags));
51
51
 
52
52
  if ((readbytes= fread(Buffer, sizeof(char), Count, stream)) != Count)
53
53
  {
94
94
  uint errors;
95
95
#endif
96
96
  DBUG_ENTER("my_fwrite");
97
 
  DBUG_PRINT("my",("stream: 0x%lx  Buffer: 0x%lx  Count: %u  MyFlags: %d",
98
 
                   (long) stream, (long) Buffer, (uint) Count, MyFlags));
 
97
  DBUG_PRINT("my",("stream: %p  Buffer: %p  Count: %u  MyFlags: %d",
 
98
                   stream, Buffer, (uint) Count, MyFlags));
99
99
 
100
100
#if !defined(NO_BACKGROUND) && defined(USE_MY_STREAM)
101
101
  errors=0;
119
119
#ifdef EINTR
120
120
      if (errno == EINTR)
121
121
      {
122
 
        VOID(my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0)));
 
122
        (void) my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0));
123
123
        continue;
124
124
      }
125
125
#endif
134
134
        if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
135
135
          my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
136
136
                   "[stream]",my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
137
 
        VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
138
 
        VOID(my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0)));
 
137
        (void) sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
 
138
        (void) my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0));
139
139
        continue;
140
140
      }
141
141
#endif
166
166
                  myf MyFlags __attribute__((unused)))
167
167
{
168
168
  DBUG_ENTER("my_fseek");
169
 
  DBUG_PRINT("my",("stream: 0x%lx  pos: %lu  whence: %d  MyFlags: %d",
170
 
                   (long) stream, (long) pos, whence, MyFlags));
 
169
  DBUG_PRINT("my",("stream: %p  pos: %lu  whence: %d  MyFlags: %d",
 
170
                   stream, (long) pos, whence, MyFlags));
171
171
  DBUG_RETURN(fseek(stream, (off_t) pos, whence) ?
172
172
              MY_FILEPOS_ERROR : (my_off_t) ftell(stream));
173
173
} /* my_seek */
179
179
{
180
180
  off_t pos;
181
181
  DBUG_ENTER("my_ftell");
182
 
  DBUG_PRINT("my",("stream: 0x%lx  MyFlags: %d", (long) stream, MyFlags));
 
182
  DBUG_PRINT("my",("stream: %p  MyFlags: %d", stream, MyFlags));
183
183
  pos=ftell(stream);
184
184
  DBUG_PRINT("exit",("ftell: %lu",(ulong) pos));
185
185
  DBUG_RETURN((my_off_t) pos);