Browse Source

Mass trailing space removal for packages (part 3).

Margers 1 day ago
parent
commit
0e06ec8d38
100 changed files with 795 additions and 795 deletions
  1. 2 2
      packages/graph/fpmake.pp
  2. 1 1
      packages/graph/src/inc/gtext.inc
  3. 28 28
      packages/graph/src/macosx/graph.pp
  4. 18 18
      packages/graph/src/sdlgraph/sdlgraph.pp
  5. 1 1
      packages/gstreamer/src/elementfactory.inc
  6. 2 2
      packages/gstreamer/src/gst.pp
  7. 1 1
      packages/gstreamer/src/gstallocator.inc
  8. 16 16
      packages/gstreamer/src/gstbuffer.inc
  9. 14 14
      packages/gstreamer/src/gstbufferlist.inc
  10. 14 14
      packages/gstreamer/src/gstcaps.inc
  11. 3 3
      packages/gstreamer/src/gstclock.inc
  12. 8 8
      packages/gstreamer/src/gstcontext.inc
  13. 2 2
      packages/gstreamer/src/gstdatetime.inc
  14. 3 3
      packages/gstreamer/src/gstelement.inc
  15. 29 29
      packages/gstreamer/src/gstevent.inc
  16. 12 12
      packages/gstreamer/src/gstformat.pp
  17. 4 4
      packages/gstreamer/src/gstinfo.inc
  18. 2 2
      packages/gstreamer/src/gstiterator.inc
  19. 14 14
      packages/gstreamer/src/gstmemory.inc
  20. 6 6
      packages/gstreamer/src/gstmessage.inc
  21. 1 1
      packages/gstreamer/src/gstmeta.inc
  22. 1 1
      packages/gstreamer/src/gstminiobject.inc
  23. 2 2
      packages/gstreamer/src/gstobject.inc
  24. 3 3
      packages/gstreamer/src/gstplugin.inc
  25. 6 6
      packages/gstreamer/src/gstpromise.inc
  26. 14 14
      packages/gstreamer/src/gstquery.inc
  27. 7 7
      packages/gstreamer/src/gstsample.inc
  28. 2 2
      packages/gstreamer/src/gstsegment.inc
  29. 23 23
      packages/gstreamer/src/gsttaglist.inc
  30. 5 5
      packages/gstreamer/src/gsttoc.inc
  31. 1 1
      packages/gstreamer/src/gsttypefind.inc
  32. 9 9
      packages/gstreamer/src/gsturi.inc
  33. 74 74
      packages/gstreamer/src/gstutils.inc
  34. 10 10
      packages/gtk1/README.txt
  35. 3 3
      packages/gtk2/fpmake.pp
  36. 2 2
      packages/gtk2/src/buildgtk2.pp
  37. 1 1
      packages/gtk2/src/glib/gclosure.inc
  38. 2 2
      packages/gtk2/src/glib/gdate.inc
  39. 1 1
      packages/gtk2/src/glib/gnode.inc
  40. 2 2
      packages/gtk2/src/glib/goption.inc
  41. 2 2
      packages/gtk2/src/gtk+/gdk/gdkdisplay.inc
  42. 1 1
      packages/gtk2/src/gtk+/gdk/gdkdrawable.inc
  43. 2 2
      packages/gtk2/src/gtk+/gdk/gdkpango.inc
  44. 5 5
      packages/gtk2/src/gtk+/gtk/gtkcellrenderercombo.inc
  45. 5 5
      packages/gtk2/src/gtk+/gtk/gtkcellrendererprogress.inc
  46. 2 2
      packages/gtk2/src/gtk+/gtk/gtkliststore.inc
  47. 1 1
      packages/gtk2/src/gtk+/gtk/gtkmain.inc
  48. 1 1
      packages/gtk2/src/gtk+/gtk/gtkmessagedialog.inc
  49. 2 2
      packages/gtk2/src/gtk2x11/include/gdkinputprivate.inc
  50. 1 1
      packages/gtk2/src/gtk2x11/include/gdkprivate-x11.inc
  51. 1 1
      packages/gtk2/src/gtk2x11/include/xsettings-client.inc
  52. 2 2
      packages/gtk2/src/gtkext/gtk2ext.pp
  53. 16 16
      packages/gtk2/src/gtkglext/gdkglenumtypes.inc
  54. 2 2
      packages/gtk2/src/gtkglext/gdkglext.pas
  55. 2 2
      packages/gtk2/src/gtkglext/gdkglpixmap.inc
  56. 2 2
      packages/gtk2/src/gtkglext/gdkglwindow.inc
  57. 2 2
      packages/gtk2/src/gtkglext/gtkglext.pas
  58. 1 1
      packages/gtk2/src/gtkglext/gtkglwidget.inc
  59. 1 1
      packages/gtk2/src/pango/pango-glyph-item.inc
  60. 1 1
      packages/gtk2/src/pango/pango-layout.inc
  61. 4 4
      packages/gtk2/src/pango/pango-renderer.inc
  62. 11 11
      packages/gtk2/src/pangocairo/pangocairo.pas
  63. 1 1
      packages/hash/fpmake.pp
  64. 1 1
      packages/hash/src/fnvhash.pp
  65. 1 1
      packages/hash/src/md5i386.inc
  66. 2 2
      packages/hash/tests/tsha1test.pp
  67. 1 1
      packages/hermes/src/hermes.pp
  68. 4 4
      packages/httpd13/src/ap.inc
  69. 5 5
      packages/httpd13/src/ap_alloc.inc
  70. 6 6
      packages/httpd13/src/ap_config.inc
  71. 3 3
      packages/httpd13/src/ap_mmn.inc
  72. 5 5
      packages/httpd13/src/buff.inc
  73. 2 2
      packages/httpd13/src/hsregex.inc
  74. 4 4
      packages/httpd13/src/http_config.inc
  75. 19 19
      packages/httpd13/src/http_core.inc
  76. 1 1
      packages/httpd13/src/http_log.inc
  77. 2 2
      packages/httpd13/src/http_main.inc
  78. 28 28
      packages/httpd13/src/httpd.inc
  79. 2 2
      packages/httpd13/src/readdir.inc
  80. 1 1
      packages/httpd13/src/util_uri.inc
  81. 1 1
      packages/httpd20/examples/define.inc
  82. 17 17
      packages/httpd20/examples/minimain.pas
  83. 18 18
      packages/httpd20/examples/mod_example.pp
  84. 3 3
      packages/httpd20/examples/mod_hello.pp
  85. 18 18
      packages/httpd20/examples/mod_spelling.pp
  86. 4 4
      packages/httpd20/fpmake.pp
  87. 3 3
      packages/httpd20/src/ap_mmn.inc
  88. 8 8
      packages/httpd20/src/ap_mpm.inc
  89. 2 2
      packages/httpd20/src/ap_release.inc
  90. 9 9
      packages/httpd20/src/apr/apr.pas
  91. 1 1
      packages/httpd20/src/apr/apr_allocator.inc
  92. 24 24
      packages/httpd20/src/apr/apr_buckets.inc
  93. 1 1
      packages/httpd20/src/apr/apr_dso.inc
  94. 49 49
      packages/httpd20/src/apr/apr_errno.inc
  95. 24 24
      packages/httpd20/src/apr/apr_file_info.inc
  96. 56 56
      packages/httpd20/src/apr/apr_file_io.inc
  97. 8 8
      packages/httpd20/src/apr/apr_general.inc
  98. 3 3
      packages/httpd20/src/apr/apr_hash.inc
  99. 2 2
      packages/httpd20/src/apr/apr_lib.inc
  100. 40 40
      packages/httpd20/src/apr/apr_network_io.inc

+ 2 - 2
packages/graph/fpmake.pp

@@ -64,7 +64,7 @@ begin
           AddInclude('fills.inc');
           AddInclude('gtext.inc');
         end;
-    // Graph unit, restricted to i8086, i386 and x86_64 CPUs 
+    // Graph unit, restricted to i8086, i386 and x86_64 CPUs
     T:=P.Targets.AddUnit('graph.pp',[i8086,i386,x86_64],[go32v2,freebsd,linux,msdos]);
       with T.Dependencies do
         begin
@@ -81,7 +81,7 @@ begin
           AddInclude('vesah.inc',[go32v2,msdos]);
         end;
 
-    // Graph unit, for win32 and win64 target 
+    // Graph unit, for win32 and win64 target
     T:=P.Targets.AddUnit('graph.pp',[win32,win64]);
       with T.Dependencies do
         begin

+ 1 - 1
packages/graph/src/inc/gtext.inc

@@ -230,7 +230,7 @@ end;
 {$ifdef CPU16}
       { TStrokes is too big for small MSDOS Stacks,
         use individual TStroke instead }
-      spo : TStroke; 
+      spo : TStroke;
 {$else}
       po: TStrokes;
 {$endif}

+ 28 - 28
packages/graph/src/macosx/graph.pp

@@ -104,7 +104,7 @@ const
   kEventFlush         = $466c7368; // 'Flsh'
   kEventCloseGraph    = $446f6e65; // 'Done'
   kEventQuit          = $51756974; // 'Quit'
-  
+
   kEventGraphInited   = $49746564 ; // Ited;
   kEventGraphClosed   = $436c6564 ; // Cled;
 
@@ -301,7 +301,7 @@ function CreateHIView (inWindow: WindowRef; const inBounds: Rect; var outControl
                         GetCurrentEventTime(), 0, event );
     if (err <> noErr) then
       goto CantCreateEvent;
- 
+
     // If bounds were specified, push the them into the initialization event
     // so that they can be used in the initialization handler.
     err := SetEventParameter( event, FOUR_CHAR_CODE('boun'), typeQDRectangle,
@@ -311,7 +311,7 @@ function CreateHIView (inWindow: WindowRef; const inBounds: Rect; var outControl
 
     err := HIObjectCreate( { kHIViewClassID } CFSTR('com.apple.hiview'), event, outControl );
     assert(err = noErr);
- 
+
     // If a parent window was specified, place the new view into the
     // parent window.
     err := GetRootControl( inWindow, root );
@@ -322,20 +322,20 @@ function CreateHIView (inWindow: WindowRef; const inBounds: Rect; var outControl
       goto CantGetRootControl;
 
     err := HIViewSetVisible(outControl, true);
- 
+
 CantCreate:
 CantGetRootControl:
 CantSetParameter:
 CantCreateEvent:
     ReleaseEvent( event );
- 
+
     CreateHIView := err;
   end;
 
 
 { Event handler which does the actual drawing by copying the offscreen to }
 { the HIView of the drawing window                                        }
-function MyDrawEventHandler (myHandler: EventHandlerCallRef; 
+function MyDrawEventHandler (myHandler: EventHandlerCallRef;
                         event: EventRef; userData: pointer): OSStatus; mwpascal;
   var
     myContext: CGContextRef;
@@ -344,9 +344,9 @@ function MyDrawEventHandler (myHandler: EventHandlerCallRef;
   begin
 //      writeln('event');
       MyDrawEventHandler := GetEventParameter (event, // 1
-                              kEventParamCGContextRef, 
-                              typeCGContextRef, 
-                              nil, 
+                              kEventParamCGContextRef,
+                              typeCGContextRef,
+                              nil,
                               sizeof (CGContextRef),
                               nil,
                               @myContext);
@@ -754,29 +754,29 @@ const
   myHIViewSpec  : EventTypeSpec = (eventClass: kEventClassControl; eventKind: kEventControlDraw);
 var
  windowAttrs:   WindowAttributes;
- contentRect:   Rect; 
+ contentRect:   Rect;
  titleKey:      CFStringRef;
- windowTitle:   CFStringRef; 
+ windowTitle:   CFStringRef;
  err:           OSStatus;
  hiviewbounds : HIRect;
  b: boolean;
 begin
   windowAttrs := kWindowStandardDocumentAttributes // 1
-                        or kWindowStandardHandlerAttribute 
+                        or kWindowStandardHandlerAttribute
                         or kWindowInWindowMenuAttribute
                         or kWindowCompositingAttribute
                         or kWindowLiveResizeAttribute
-                        or kWindowNoUpdatesAttribute; 
+                        or kWindowNoUpdatesAttribute;
 
   SetRect (contentRect, 0,  0,
                          MaxX+1, MaxY+1);
-  
+
   CreateNewWindow (kDocumentWindowClass, windowAttrs,// 3
                          contentRect, myMainWindow);
-  
+
   SetRect (contentRect, 0,  50,
                          MaxX+1, 51+MaxY);
-  
+
   SetWindowBounds(myMainWindow,kWindowContentRgn,contentrect);
   titleKey    := CFSTR('Graph Window'); // 4
   windowTitle := CFCopyLocalizedString(titleKey, nil); // 5
@@ -791,7 +791,7 @@ begin
       bottom:=MaxY+1;
       right:=MaxX+1;
     end;
-    
+
   offscreen:=CreateBitmapContext(MaxX+1,MaxY+1);
   if (offscreen = nil) then
     begin
@@ -811,9 +811,9 @@ begin
 //   HIViewFindByID( HIViewGetRoot( myMainWindow ), kHIViewWindowContentID, graphHIView );
 
   if InstallEventHandler (GetControlEventTarget (graphHIView),
-                          NewEventHandlerUPP (@MyDrawEventHandler), 
+                          NewEventHandlerUPP (@MyDrawEventHandler),
                           { GetEventTypeCount (myHIViewSpec)} 1,
-                          @myHIViewSpec, 
+                          @myHIViewSpec,
                           pointer(graphHIView),
                           Nil) <> noErr then
     begin
@@ -834,7 +834,7 @@ begin
   CGContextFillRect(offscreen,CGRectMake(0,0,MaxX+1,MaxY+1));
   HIViewSetNeedsDisplay(graphHIView, true);
 
-  ShowWindow (myMainWindow);  
+  ShowWindow (myMainWindow);
 
 {
   write('view is active: ',HIViewIsActive(graphHIView,@b));
@@ -894,7 +894,7 @@ begin
       _GraphResult:=grError;
       exit;
     end;
-    
+
   if (ReceiveNextEvent(length(GraphClosedSpec),@GraphClosedSpec,kEventDurationForever,true,event) <> noErr) then
     runerror(218);
   ReleaseEvent(event);
@@ -1042,13 +1042,13 @@ end;
          else if (colorstr='256') then
            colors:=256
 {
-         These don't work very well 
+         These don't work very well
          else if (colorstr='32K') then
            colors:=32768
          else if (colorstr='64K') then
            colors:=65536
 }
-         else 
+         else
 //           1/24/32 bit not supported
            continue;
          if (xres <= dispxres) and
@@ -1061,7 +1061,7 @@ end;
 
 { ************************************************* }
 
-function GraphEventHandler (myHandler: EventHandlerCallRef; 
+function GraphEventHandler (myHandler: EventHandlerCallRef;
                         event: EventRef; userData: pointer): OSStatus; mwpascal;
 var
   source: EventQueueRef;
@@ -1116,7 +1116,7 @@ procedure FPCMacOSXGraphMain(argcpara: cint; argvpara, envppara: PPAnsiChar); cd
 function wrapper(p: pointer): pointer; cdecl;
   var
     mainparas: pmainparas absolute p;
-  begin 
+  begin
     FPCMacOSXGraphMain(mainparas^.argc, mainparas^.argv, mainparas^.envp);
     wrapper:=nil;
     { the main program should exit }
@@ -1135,13 +1135,13 @@ procedure main(argcpara: cint; argvpara, envppara: PPAnsiChar); cdecl; [public];
     mainparas: tmainparas;
   begin
     if InstallEventHandler (GetApplicationEventTarget,
-                            NewEventHandlerUPP (@GraphEventHandler), 
+                            NewEventHandlerUPP (@GraphEventHandler),
                             length(allGraphSpec),
-                            @allGraphSpec, 
+                            @allGraphSpec,
                             nil,
                             nil) <> noErr then
       fpexit(1);
-  
+
     { main program has to be the first one to access the event queue, see }
     { http://lists.apple.com/archives/carbon-dev/2007/Jun/msg00612.html   }
     eventavail(0,eventRec);

+ 18 - 18
packages/graph/src/sdlgraph/sdlgraph.pp

@@ -22,7 +22,7 @@ TODO: color conversion. from pascal color constant to color (pixel) from SDL_put
 
 TODO: check all mode.HardwarePages and find true value for each mode!
 
-TODO: check initgraph(0,0,' ') and work with modes to set up best SDL mode. 
+TODO: check initgraph(0,0,' ') and work with modes to set up best SDL mode.
 Maybe to hook internDetectGraph and detectGraph. I thing they are not needed for sdlgraph
 
 TODO: check VESA modes ModeNumber (if they needed)
@@ -83,35 +83,35 @@ It's highly recommended to use Detect (0 constant) for grDriver and grmode: init
  //CGAC2         =2;   is in graphh.inc
  //CGAC3         =3;   is in graphh.inc
  //CGAHi         =4;   is in graphh.inc
- 
+
  //MCGAC0        =0;   is in graphh.inc
  //MCGAC         =1;   is in graphh.inc
  //MCGAC2        =2;   is in graphh.inc
  //MCGAC3        =3;   is in graphh.inc
  //MCGAMed       =4;   is in graphh.inc
  //MCGAHi        =5;   is in graphh.inc
- 
+
  //EGAMonoHi     =3;   is in graphh.inc
  //HercMonoHi    =0;      is in the graphh.inc
  //VGALo         =0;      is in the graphh.inc
  //VGAMed        =1;      is in the graphh.inc
  //VGAHi         =2;      is in the graphh.inc
- 
+
  //EGALo         =0;   is in graphh.inc
  //EGAHi         =1;   is in graphh.inc
  //EGA64Lo       =0;   is in graphh.inc
  //EGA64Hi       =1;   is in graphh.inc
- 
+
  ATT400C0      =0;
  ATT400C1      =1;
  ATT400C2      =2;
  ATT400C3      =3;
  ATT400CMed    =4;
  ATT400Hi      =5;
- 
+
  IBM8514Lo     =0;
  IBM8514Hi     =1;
- 
+
  PC3270Hi      =0;
 
 { From *Go32* VESA Specific video modes. }
@@ -210,7 +210,7 @@ end;
 
 procedure Sulock; //Unlock and flip the surface
 begin
-  if SDL_MUSTLOCK(screen) then 
+  if SDL_MUSTLOCK(screen) then
     SDL_UnlockSurface(screen);
   SDL_Flip(screen);
 
@@ -377,7 +377,7 @@ procedure InitSDLgraph(Width,Height,BPP:Integer);
 var
  videoflags : Uint32;
  videoInfo : PSDL_VideoInfo;
- 
+
  flip_callback_param:Pointer;
  flip_timer_id:PSDL_TimerID;
 begin
@@ -388,7 +388,7 @@ begin
   end;
 
 
-  // Fetch the video info 
+  // Fetch the video info
   videoInfo := SDL_GetVideoInfo;
 
   if ( videoInfo = nil ) then
@@ -399,11 +399,11 @@ begin
   end;
 
 
-  // the flags to pass to SDL_SetVideoMode 
-  videoFlags := SDL_DOUBLEBUF; // Enable double buffering 
-  videoFlags := videoFlags or SDL_HWPALETTE; // Store the palette in hardware 
+  // the flags to pass to SDL_SetVideoMode
+  videoFlags := SDL_DOUBLEBUF; // Enable double buffering
+  videoFlags := videoFlags or SDL_HWPALETTE; // Store the palette in hardware
 
-  // This checks to see if surfaces can be stored in memory 
+  // This checks to see if surfaces can be stored in memory
  if  videoInfo^.hw_available <> 0  then
     videoFlags := videoFlags or SDL_HWSURFACE
   else
@@ -423,7 +423,7 @@ begin
      end;
 
   screen := SDL_SetVideoMode(Width, Height, BPP, SDL_SWSURFACE );   // TODO: use videoflags but not SDL_SWSURFACE!
-    
+
 //It doesn't work yet!
 {if ( surface = nil ) then
   begin
@@ -834,7 +834,7 @@ begin
             mode.InitMode := {$ifdef fpc}@{$endif}sdlgraph_Init800x600x64k;
             setupSDLgraphDefaults;
             AddMode(mode);
-   
+
             InitMode(mode);
             mode.ModeNumber:=m1024x768x16;
             mode.DriverNumber := VESA;
@@ -848,7 +848,7 @@ begin
             mode.InitMode := {$ifdef fpc}@{$endif}sdlgraph_Init1024x768x16;
             setupSDLgraphDefaults;
             AddMode(mode);
-            
+
             InitMode(mode);
             mode.ModeNumber:=m1024x768x256;
             mode.DriverNumber := VESA;
@@ -862,7 +862,7 @@ begin
             mode.InitMode := {$ifdef fpc}@{$endif}sdlgraph_Init1024x768x256;
             setupSDLgraphDefaults;
             AddMode(mode);
-       
+
             InitMode(mode);
             mode.ModeNumber:=m1024x768x32k;
             mode.DriverNumber := VESA;

+ 1 - 1
packages/gstreamer/src/elementfactory.inc

@@ -16,6 +16,6 @@
 {$ENDIF}
 
 
-(* error 
+(* error
 
 

+ 2 - 2
packages/gstreamer/src/gst.pp

@@ -37,7 +37,7 @@ uses glib2;
 {$ENDIF FPC_DOTTEDUNITS}
 
 const
-  { Setup as you need } 
+  { Setup as you need }
 
 {$ifdef Windows}
   gstreamerlib = 'gstreamer-1.0-0.dll';
@@ -202,5 +202,5 @@ implementation
 {$i gstbin_impl.inc}
 {$i gstmessage_impl.inc}
 
-end. 
+end.
 

+ 1 - 1
packages/gstreamer/src/gstallocator.inc

@@ -91,7 +91,7 @@
 
   procedure gst_allocator_free(allocator:PGstAllocator; memory:PGstMemory);cdecl;external gstreamerlib name 'gst_allocator_free';
 
-  function gst_memory_new_wrapped(flags:TGstMemoryFlags; data:Tgpointer; maxsize:Tgsize; offset:Tgsize; size:Tgsize; 
+  function gst_memory_new_wrapped(flags:TGstMemoryFlags; data:Tgpointer; maxsize:Tgsize; offset:Tgsize; size:Tgsize;
              user_data:Tgpointer; notify:TGDestroyNotify):PGstMemory;cdecl;external gstreamerlib name 'gst_memory_new_wrapped';
 
 

+ 16 - 16
packages/gstreamer/src/gstbuffer.inc

@@ -113,7 +113,7 @@
 
   function gst_buffer_new_allocate(allocator:PGstAllocator; size:Tgsize; params:PGstAllocationParams):PGstBuffer;cdecl;external gstreamerlib name 'gst_buffer_new_allocate';
 
-  function gst_buffer_new_wrapped_full(flags:TGstMemoryFlags; data:Tgpointer; maxsize:Tgsize; offset:Tgsize; size:Tgsize; 
+  function gst_buffer_new_wrapped_full(flags:TGstMemoryFlags; data:Tgpointer; maxsize:Tgsize; offset:Tgsize; size:Tgsize;
              user_data:Tgpointer; notify:TGDestroyNotify):PGstBuffer;cdecl;external gstreamerlib name 'gst_buffer_new_wrapped_full';
 
   function gst_buffer_new_wrapped(data:Tgpointer; size:Tgsize):PGstBuffer;cdecl;external gstreamerlib name 'gst_buffer_new_wrapped';
@@ -148,7 +148,7 @@
 
   procedure gst_buffer_remove_all_memory(buffer:PGstBuffer);cdecl;external gstreamerlib name 'gst_buffer_remove_all_memory';
 
-  function gst_buffer_find_memory(buffer:PGstBuffer; offset:Tgsize; size:Tgsize; idx:Pguint; length:Pguint; 
+  function gst_buffer_find_memory(buffer:PGstBuffer; offset:Tgsize; size:Tgsize; idx:Pguint; length:Pguint;
              skip:Pgsize):Tgboolean;cdecl;external gstreamerlib name 'gst_buffer_find_memory';
 
   function gst_buffer_is_memory_range_writable(buffer:PGstBuffer; idx:Tguint; length:Tgint):Tgboolean;cdecl;external gstreamerlib name 'gst_buffer_is_memory_range_writable';
@@ -192,35 +192,35 @@
   function gst_buffer_unset_flags(buffer:PGstBuffer; flags:TGstBufferFlags):Tgboolean;cdecl;external gstreamerlib name 'gst_buffer_unset_flags';
 
   {
-  
+
   static inline GstBuffer *
   gst_buffer_ref (GstBuffer * buf)
-  
+
     return (GstBuffer *) gst_mini_object_ref (((GstMiniObject*)(buf)));
-  
+
   # 441 "gstbuffer.h"
   static inline void
   gst_buffer_unref (GstBuffer * buf)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(buf)));
-  
+
   # 460 "gstbuffer.h"
   static inline void
   gst_clear_buffer (GstBuffer ** buf_ptr)
-  
-    do  _Static_assert (sizeof *(((GstMiniObject **) buf_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) buf_ptr))) _pp = (((GstMiniObject **) buf_ptr)); __typeof__(*(((GstMiniObject **) buf_ptr))) _ptr = *_pp; *_pp = 
+
+    do  _Static_assert (sizeof *(((GstMiniObject **) buf_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) buf_ptr))) _pp = (((GstMiniObject **) buf_ptr)); __typeof__(*(((GstMiniObject **) buf_ptr))) _ptr = *_pp; *_pp =
   # 463 "gstbuffer.h" 3 4
    ((void *)0)
   # 463 "gstbuffer.h"
    ; if (_ptr) (gst_mini_object_unref) (_ptr);  while (0) ;
-  
+
   # 479 "gstbuffer.h"
   static inline GstBuffer *
   gst_buffer_copy (const GstBuffer * buf)
-  
+
     return (((GstBuffer *)(gst_mini_object_copy (((const GstMiniObject*)(buf))))));
-  
-  
+
+
    }
 (* Const before type ignored *)
   function gst_buffer_copy_deep(buf:PGstBuffer):PGstBuffer;cdecl;external gstreamerlib name 'gst_buffer_copy_deep';
@@ -232,10 +232,10 @@
   {
   static inline gboolean
   gst_buffer_replace (GstBuffer **obuf, GstBuffer *nbuf)
-  
+
     return gst_mini_object_replace ((GstMiniObject **) obuf, (GstMiniObject *) nbuf);
-  
-  
+
+
    }
   function gst_buffer_copy_region(parent:PGstBuffer; flags:TGstBufferCopyFlags; offset:Tgsize; size:Tgsize):PGstBuffer;cdecl;external gstreamerlib name 'gst_buffer_copy_region';
 

+ 14 - 14
packages/gstreamer/src/gstbufferlist.inc

@@ -42,49 +42,49 @@
   TGstBufferList_queueautoptr = PGQueue;
 
   {
-  
+
   static inline GstBufferList *
   gst_buffer_list_ref (GstBufferList * list)
-  
+
     return ((GstBufferList *)gst_mini_object_ref (((GstMiniObject*)(list))))
                ;
-  
+
   # 90 "gstbufferlist.h"
   static inline void
   gst_buffer_list_unref (GstBufferList * list)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(list)));
-  
+
   # 109 "gstbufferlist.h"
   static inline void
   gst_clear_buffer_list (GstBufferList ** list_ptr)
-  
-    do  _Static_assert (sizeof *(((GstMiniObject **) list_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) list_ptr))) _pp = (((GstMiniObject **) list_ptr)); __typeof__(*(((GstMiniObject **) list_ptr))) _ptr = *_pp; *_pp = 
+
+    do  _Static_assert (sizeof *(((GstMiniObject **) list_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) list_ptr))) _pp = (((GstMiniObject **) list_ptr)); __typeof__(*(((GstMiniObject **) list_ptr))) _ptr = *_pp; *_pp =
   # 112 "gstbufferlist.h" 3 4
    ((void *)0)
   # 112 "gstbufferlist.h"
    ; if (_ptr) (gst_mini_object_unref) (_ptr);  while (0) ;
-  
+
   # 126 "gstbufferlist.h"
   static inline GstBufferList *
   gst_buffer_list_copy (const GstBufferList * list)
-  
+
     return ((GstBufferList *)gst_mini_object_copy (((const GstMiniObject*)(list))));
-  
+
   # 150 "gstbufferlist.h"
   static inline gboolean
   gst_buffer_list_replace (GstBufferList **old_list, GstBufferList *new_list)
-  
+
     return gst_mini_object_replace ((GstMiniObject **) old_list,
         (GstMiniObject *) new_list);
-  
+
   # 172 "gstbufferlist.h"
   static inline gboolean
   gst_buffer_list_take (GstBufferList **old_list, GstBufferList *new_list)
-  
+
     return gst_mini_object_take ((GstMiniObject **) old_list,
         (GstMiniObject *) new_list);
-  
+
    }
 
   function gst_buffer_list_get_type:TGType;cdecl;external gstreamerlib name 'gst_buffer_list_get_type';

+ 14 - 14
packages/gstreamer/src/gstcaps.inc

@@ -56,29 +56,29 @@
   TGstCaps_queueautoptr = PGQueue;
 
   {
-  
+
   static inline GstCaps *
   gst_caps_ref (GstCaps * caps)
-  
+
     return (GstCaps *) gst_mini_object_ref (((GstMiniObject*)(caps)));
-  
+
   # 220 "gstcaps.h"
-  
+
   static inline void
   gst_caps_unref (GstCaps * caps)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(caps)));
-  
+
   # 239 "gstcaps.h"
   static inline void
   gst_clear_caps (GstCaps ** caps_ptr)
-  
-    do  _Static_assert (sizeof *(((GstMiniObject **) caps_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) caps_ptr))) _pp = (((GstMiniObject **) caps_ptr)); __typeof__(*(((GstMiniObject **) caps_ptr))) _ptr = *_pp; *_pp = 
+
+    do  _Static_assert (sizeof *(((GstMiniObject **) caps_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) caps_ptr))) _pp = (((GstMiniObject **) caps_ptr)); __typeof__(*(((GstMiniObject **) caps_ptr))) _ptr = *_pp; *_pp =
   # 242 "gstcaps.h" 3 4
    ((void *)0)
   # 242 "gstcaps.h"
    ; if (_ptr) (gst_mini_object_unref) (_ptr);  while (0) ;
-  
+
    }
 (* Const before type ignored *)
 
@@ -87,16 +87,16 @@
   {
   static inline gboolean
   gst_caps_replace (GstCaps **old_caps, GstCaps *new_caps)
-  
+
       return gst_mini_object_replace ((GstMiniObject **) old_caps, (GstMiniObject *) new_caps);
-  
+
   # 316 "gstcaps.h"
   static inline gboolean
   gst_caps_take (GstCaps **old_caps, GstCaps *new_caps)
-  
+
       return gst_mini_object_take ((GstMiniObject **) old_caps, (GstMiniObject *) new_caps);
-  
-  
+
+
    }
 
 

+ 3 - 3
packages/gstreamer/src/gstclock.inc

@@ -129,17 +129,17 @@ TGstClockEntry =T_GstClockEntry;
 
   function gst_clock_add_observation(clock:PGstClock; slave:TGstClockTime; master:TGstClockTime; r_squared:Pgdouble):Tgboolean;cdecl;external gstreamerlib name 'gst_clock_add_observation';
 
-  function gst_clock_add_observation_unapplied(clock:PGstClock; slave:TGstClockTime; master:TGstClockTime; r_squared:Pgdouble; internal:PGstClockTime; 
+  function gst_clock_add_observation_unapplied(clock:PGstClock; slave:TGstClockTime; master:TGstClockTime; r_squared:Pgdouble; internal:PGstClockTime;
              external:PGstClockTime; rate_num:PGstClockTime; rate_denom:PGstClockTime):Tgboolean;cdecl;external gstreamerlib name 'gst_clock_add_observation_unapplied';
 
   function gst_clock_get_internal_time(clock:PGstClock):TGstClockTime;cdecl;external gstreamerlib name 'gst_clock_get_internal_time';
 
   function gst_clock_adjust_unlocked(clock:PGstClock; internal:TGstClockTime):TGstClockTime;cdecl;external gstreamerlib name 'gst_clock_adjust_unlocked';
 
-  function gst_clock_adjust_with_calibration(clock:PGstClock; internal_target:TGstClockTime; cinternal:TGstClockTime; cexternal:TGstClockTime; cnum:TGstClockTime; 
+  function gst_clock_adjust_with_calibration(clock:PGstClock; internal_target:TGstClockTime; cinternal:TGstClockTime; cexternal:TGstClockTime; cnum:TGstClockTime;
              cdenom:TGstClockTime):TGstClockTime;cdecl;external gstreamerlib name 'gst_clock_adjust_with_calibration';
 
-  function gst_clock_unadjust_with_calibration(clock:PGstClock; external_target:TGstClockTime; cinternal:TGstClockTime; cexternal:TGstClockTime; cnum:TGstClockTime; 
+  function gst_clock_unadjust_with_calibration(clock:PGstClock; external_target:TGstClockTime; cinternal:TGstClockTime; cexternal:TGstClockTime; cnum:TGstClockTime;
              cdenom:TGstClockTime):TGstClockTime;cdecl;external gstreamerlib name 'gst_clock_unadjust_with_calibration';
 
   function gst_clock_unadjust_unlocked(clock:PGstClock; external:TGstClockTime):TGstClockTime;cdecl;external gstreamerlib name 'gst_clock_unadjust_unlocked';

+ 8 - 8
packages/gstreamer/src/gstcontext.inc

@@ -50,27 +50,27 @@
   {
   static inline GstContext *
   gst_context_ref (GstContext * context)
-  
+
     return (GstContext *) gst_mini_object_ref (((GstMiniObject*)(context)));
-  
+
   # 71 "gstcontext.h"
   static inline void
   gst_context_unref (GstContext * context)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(context)));
-  
+
   # 88 "gstcontext.h"
   static inline GstContext *
   gst_context_copy (const GstContext * context)
-  
+
     return ((GstContext*)(gst_mini_object_copy (((const GstMiniObject*)(context)))));
-  
+
   # 130 "gstcontext.h"
   static inline gboolean
   gst_context_replace (GstContext **old_context, GstContext *new_context)
-  
+
     return gst_mini_object_replace ((GstMiniObject **) old_context, (GstMiniObject *) new_context);
-  
+
    }
 (* Const before type ignored *)
   function gst_context_new(context_type:Pgchar; persistent:Tgboolean):PGstContext;cdecl;external gstreamerlib name 'gst_context_new';

+ 2 - 2
packages/gstreamer/src/gstdatetime.inc

@@ -90,7 +90,7 @@
 
   function gst_date_time_new_from_unix_epoch_utc(secs:Tgint64):PGstDateTime;cdecl;external gstreamerlib name 'gst_date_time_new_from_unix_epoch_utc';
 
-  function gst_date_time_new_local_time(year:Tgint; month:Tgint; day:Tgint; hour:Tgint; minute:Tgint; 
+  function gst_date_time_new_local_time(year:Tgint; month:Tgint; day:Tgint; hour:Tgint; minute:Tgint;
              seconds:Tgdouble):PGstDateTime;cdecl;external gstreamerlib name 'gst_date_time_new_local_time';
 
   function gst_date_time_new_y(year:Tgint):PGstDateTime;cdecl;external gstreamerlib name 'gst_date_time_new_y';
@@ -99,7 +99,7 @@
 
   function gst_date_time_new_ymd(year:Tgint; month:Tgint; day:Tgint):PGstDateTime;cdecl;external gstreamerlib name 'gst_date_time_new_ymd';
 
-  function gst_date_time_new(tzoffset:Tgfloat; year:Tgint; month:Tgint; day:Tgint; hour:Tgint; 
+  function gst_date_time_new(tzoffset:Tgfloat; year:Tgint; month:Tgint; day:Tgint; hour:Tgint;
              minute:Tgint; seconds:Tgdouble):PGstDateTime;cdecl;external gstreamerlib name 'gst_date_time_new';
 
   function gst_date_time_new_now_local_time:PGstDateTime;cdecl;external gstreamerlib name 'gst_date_time_new_now_local_time';

+ 3 - 3
packages/gstreamer/src/gstelement.inc

@@ -162,7 +162,7 @@ Type
 
   function gst_element_send_event(element:PGstElement; event:PGstEvent):Tgboolean;cdecl;external gstreamerlib name 'gst_element_send_event';
 
-  function gst_element_seek(element:PGstElement; rate:Tgdouble; format:TGstFormat; flags:TGstSeekFlags; start_type:TGstSeekType; 
+  function gst_element_seek(element:PGstElement; rate:Tgdouble; format:TGstFormat; flags:TGstSeekFlags; start_type:TGstSeekType;
              start:Tgint64; stop_type:TGstSeekType; stop:Tgint64):Tgboolean;cdecl;external gstreamerlib name 'gst_element_seek';
 
   function gst_element_query(element:PGstElement; query:PGstQuery):Tgboolean;cdecl;external gstreamerlib name 'gst_element_query';
@@ -176,12 +176,12 @@ Type
 
 (* Const before type ignored *)
 (* Const before type ignored *)
-  procedure gst_element_message_full(element:PGstElement; _type:TGstMessageType; domain:TGQuark; code:Tgint; text:Pgchar; 
+  procedure gst_element_message_full(element:PGstElement; _type:TGstMessageType; domain:TGQuark; code:Tgint; text:Pgchar;
               debug:Pgchar; afile:Pgchar; _function:Pgchar; line:Tgint);cdecl;external gstreamerlib name 'gst_element_message_full';
 
 (* Const before type ignored *)
 (* Const before type ignored *)
-  procedure gst_element_message_full_with_details(element:PGstElement; _type:TGstMessageType; domain:TGQuark; code:Tgint; text:Pgchar; 
+  procedure gst_element_message_full_with_details(element:PGstElement; _type:TGstMessageType; domain:TGQuark; code:Tgint; text:Pgchar;
               debug:Pgchar; afile:Pgchar; _function:Pgchar; line:Tgint; structure:PGstStructure);cdecl;external gstreamerlib name 'gst_element_message_full_with_details';
 
   function gst_element_is_locked_state(element:PGstElement):Tgboolean;cdecl;external gstreamerlib name 'gst_element_is_locked_state';

+ 29 - 29
packages/gstreamer/src/gstevent.inc

@@ -115,71 +115,71 @@
   end;
   TGstEvent = T_GstEvent;
   {
-  
+
   static inline gboolean
   gst_event_replace (GstEvent **old_event, GstEvent *new_event)
-  
+
     return gst_mini_object_replace ((GstMiniObject **) old_event, (GstMiniObject *) new_event);
-  
+
   # 347 "gstevent.h"
   static inline GstEvent *
   gst_event_steal (GstEvent **old_event)
-  
+
     return ((GstEvent *)(gst_mini_object_steal ((GstMiniObject **) old_event)));
-  
+
   # 368 "gstevent.h"
   static inline gboolean
   gst_event_take (GstEvent **old_event, GstEvent *new_event)
-  
+
     return gst_mini_object_take ((GstMiniObject **) old_event, (GstMiniObject *) new_event);
-  
+
   # 389 "gstevent.h"
   # 405 "gstevent.h"
 
   extern
   const gchar* gst_event_type_get_name (GstEventType type);
-  
+
   extern
   GQuark gst_event_type_to_quark (GstEventType type);
-  
+
   extern
   GstEventTypeFlags
                   gst_event_type_get_flags (GstEventType type);
   # 435 "gstevent.h"
   static inline GstEvent *
   gst_event_ref (GstEvent * event)
-  
+
     return (GstEvent *) gst_mini_object_ref (((GstMiniObject*)(event)));
-  
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
+
   static inline void
   gst_event_unref (GstEvent * event)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(event)));
-  
+
   # 466 "gstevent.h"
   static inline void
   gst_clear_event (GstEvent ** event_ptr)
-  
-    do  _Static_assert (sizeof *(((GstMiniObject **) event_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) event_ptr))) _pp = (((GstMiniObject **) event_ptr)); __typeof__(*(((GstMiniObject **) event_ptr))) _ptr = *_pp; *_pp = 
+
+    do  _Static_assert (sizeof *(((GstMiniObject **) event_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) event_ptr))) _pp = (((GstMiniObject **) event_ptr)); __typeof__(*(((GstMiniObject **) event_ptr))) _ptr = *_pp; *_pp =
   # 469 "gstevent.h" 3 4
    ((void *)0)
   # 469 "gstevent.h"
    ; if (_ptr) (gst_mini_object_unref) (_ptr);  while (0) ;
-  
+
   # 481 "gstevent.h"
   static inline GstEvent *
   gst_event_copy (const GstEvent * event)
-  
+
     return ((GstEvent *)(gst_mini_object_copy (((const GstMiniObject*)(event)))));
-  
-  
+
+
    }
 
   function gst_event_get_type:TGType;cdecl;external gstreamerlib name 'gst_event_get_type';
@@ -285,10 +285,10 @@
 
   procedure gst_event_parse_qos(event:PGstEvent; _type:PGstQOSType; proportion:Pgdouble; diff:PGstClockTimeDiff; timestamp:PGstClockTime);cdecl;external gstreamerlib name 'gst_event_parse_qos';
 
-  function gst_event_new_seek(rate:Tgdouble; format:TGstFormat; flags:TGstSeekFlags; start_type:TGstSeekType; start:Tgint64; 
+  function gst_event_new_seek(rate:Tgdouble; format:TGstFormat; flags:TGstSeekFlags; start_type:TGstSeekType; start:Tgint64;
              stop_type:TGstSeekType; stop:Tgint64):PGstEvent;cdecl;external gstreamerlib name 'gst_event_new_seek';
 
-  procedure gst_event_parse_seek(event:PGstEvent; rate:Pgdouble; format:PGstFormat; flags:PGstSeekFlags; start_type:PGstSeekType; 
+  procedure gst_event_parse_seek(event:PGstEvent; rate:Pgdouble; format:PGstFormat; flags:PGstSeekFlags; start_type:PGstSeekType;
               start:Pgint64; stop_type:PGstSeekType; stop:Pgint64);cdecl;external gstreamerlib name 'gst_event_parse_seek';
 
   procedure gst_event_set_seek_trickmode_interval(event:PGstEvent; interval:TGstClockTime);cdecl;external gstreamerlib name 'gst_event_set_seek_trickmode_interval';
@@ -303,7 +303,7 @@
 
   function gst_event_new_step(format:TGstFormat; amount:Tguint64; rate:Tgdouble; flush:Tgboolean; intermediate:Tgboolean):PGstEvent;cdecl;external gstreamerlib name 'gst_event_new_step';
 
-  procedure gst_event_parse_step(event:PGstEvent; format:PGstFormat; amount:Pguint64; rate:Pgdouble; flush:Pgboolean; 
+  procedure gst_event_parse_step(event:PGstEvent; format:PGstFormat; amount:Pguint64; rate:Pgdouble; flush:Pgboolean;
               intermediate:Pgboolean);cdecl;external gstreamerlib name 'gst_event_parse_step';
 
   function gst_event_new_reconfigure:PGstEvent;cdecl;external gstreamerlib name 'gst_event_new_reconfigure';

+ 12 - 12
packages/gstreamer/src/gstformat.pp

@@ -36,7 +36,7 @@ interface
    * Boston, MA 02110-1301, USA.
     }
 {$ifndef __GST_FORMAT_H__}
-{$define __GST_FORMAT_H__}  
+{$define __GST_FORMAT_H__}
 {$include <glib.h>}
 {$include <gst/gstiterator.h>}
   {*
@@ -57,7 +57,7 @@ interface
     }
   { NOTE: don't forget to update the table in gstformat.c when changing
    * this enum  }
-(* error 
+(* error
 typedef enum {
   { must be first in list  }
 in declaration at line 59 *)
@@ -101,39 +101,39 @@ in declaration at line 59 *)
           quark : GQuark;
         end;
 
-(* error 
+(* error
 const gchar*    gst_format_get_name             (GstFormat format);
  in declarator_list *)
-(* error 
+(* error
 GQuark          gst_format_to_quark             (GstFormat format);
  in declarator_list *)
     { register a new format  }
-(* error 
+(* error
 GstFormat       gst_format_register             (const gchar *nick,
-(* error 
+(* error
                                                  const gchar *description);
  in declarator_list *)
  in declarator_list *)
-(* error 
+(* error
 GstFormat       gst_format_get_by_nick          (const gchar *nick);
  in declarator_list *)
     { check if a format is in an array of formats  }
-(* error 
+(* error
 gboolean        gst_formats_contains            (const GstFormat *formats, GstFormat format);
-(* error 
+(* error
 gboolean        gst_formats_contains            (const GstFormat *formats, GstFormat format);
  in declarator_list *)
  in declarator_list *)
     { query for format details  }
-(* error 
+(* error
 const GstFormatDefinition*
  in declarator_list *)
-(* error 
+(* error
 GstIterator*    gst_format_iterate_definitions  (void);
  in declarator_list *)
 {$endif}
     { __GST_FORMAT_H__  }
-(* error 
+(* error
 #endif /* __GST_FORMAT_H__ */
 
 implementation

+ 4 - 4
packages/gstreamer/src/gstinfo.inc

@@ -89,15 +89,15 @@
     TGstDebugMessage = record end;
     T_GstDebugMessage = TGstDebugMessage;
 
-    TGstLogFunction = procedure (category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint; 
+    TGstLogFunction = procedure (category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint;
                   aobject:PGObject; message:PGstDebugMessage; user_data:Tgpointer);cdecl;
 
   TGstDebugFuncPtr = procedure (_para1:pointer);cdecl;
 
-  procedure gst_debug_log(category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint; 
+  procedure gst_debug_log(category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint;
               object_:PGObject; format:Pgchar; args:array of const);cdecl;external gstreamerlib name 'gst_debug_log';
 
-  procedure gst_debug_log(category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint; 
+  procedure gst_debug_log(category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint;
               object_:PGObject; format:Pgchar);cdecl;external gstreamerlib name 'gst_debug_log';
 
   procedure gst_debug_log_valist(category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint;
@@ -122,7 +122,7 @@
 
 (* Const before type ignored *)
 (* Const before type ignored *)
-  procedure gst_debug_log_default(category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint; 
+  procedure gst_debug_log_default(category:PGstDebugCategory; level:TGstDebugLevel; afile:Pgchar; _function:Pgchar; line:Tgint;
               object_:PGObject; message:PGstDebugMessage; user_data:Tgpointer);cdecl;external gstreamerlib name 'gst_debug_log_default';
 
 (* Const before type ignored *)

+ 2 - 2
packages/gstreamer/src/gstiterator.inc

@@ -91,10 +91,10 @@
 
   function gst_iterator_get_type:TGType;cdecl;external gstreamerlib name 'gst_iterator_get_type';
 
-  function gst_iterator_new(size:Tguint; _type:TGType; lock:PGMutex; master_cookie:Pguint32; copy:TGstIteratorCopyFunction; 
+  function gst_iterator_new(size:Tguint; _type:TGType; lock:PGMutex; master_cookie:Pguint32; copy:TGstIteratorCopyFunction;
              next:TGstIteratorNextFunction; item:TGstIteratorItemFunction; resync:TGstIteratorResyncFunction; free:TGstIteratorFreeFunction):PGstIterator;cdecl;external gstreamerlib name 'gst_iterator_new';
 
-  function gst_iterator_new_list(_type:TGType; lock:PGMutex; master_cookie:Pguint32; list:PPGList; owner:PGObject; 
+  function gst_iterator_new_list(_type:TGType; lock:PGMutex; master_cookie:Pguint32; list:PPGList; owner:PGObject;
              item:TGstIteratorItemFunction):PGstIterator;cdecl;external gstreamerlib name 'gst_iterator_new_list';
 
 (* Const before type ignored *)

+ 14 - 14
packages/gstreamer/src/gstmemory.inc

@@ -125,32 +125,32 @@
 
   function gst_memory_get_type:TGType;cdecl;external gstreamerlib name 'gst_memory_get_type';
 
-  procedure gst_memory_init(mem:PGstMemory; flags:TGstMemoryFlags; allocator:PGstAllocator; parent:PGstMemory; maxsize:Tgsize; 
+  procedure gst_memory_init(mem:PGstMemory; flags:TGstMemoryFlags; allocator:PGstAllocator; parent:PGstMemory; maxsize:Tgsize;
               align:Tgsize; offset:Tgsize; size:Tgsize);cdecl;external gstreamerlib name 'gst_memory_init';
 
 (* Const before type ignored *)
   function gst_memory_is_type(mem:PGstMemory; mem_type:Pgchar):Tgboolean;cdecl;external gstreamerlib name 'gst_memory_is_type';
 
   {
-  
+
   static inline GstMemory *
   gst_memory_ref (GstMemory * memory)
-  
+
     return (GstMemory *) gst_mini_object_ref (((GstMiniObject*)(memory)));
-  
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
+
   static inline void
   gst_memory_unref (GstMemory * memory)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(memory)));
-  
-  
+
+
    }
   function gst_memory_get_sizes(mem:PGstMemory; offset:Pgsize; maxsize:Pgsize):Tgsize;cdecl;external gstreamerlib name 'gst_memory_get_sizes';
 

+ 6 - 6
packages/gstreamer/src/gstmessage.inc

@@ -125,10 +125,10 @@
 
   function gst_message_new_state_dirty(src:PGstObject):PGstMessage;cdecl;external gstreamerlib name 'gst_message_new_state_dirty';
 
-  function gst_message_new_step_done(src:PGstObject; format:TGstFormat; amount:Tguint64; rate:Tgdouble; flush:Tgboolean; 
+  function gst_message_new_step_done(src:PGstObject; format:TGstFormat; amount:Tguint64; rate:Tgdouble; flush:Tgboolean;
              intermediate:Tgboolean; duration:Tguint64; eos:Tgboolean):PGstMessage;cdecl;external gstreamerlib name 'gst_message_new_step_done';
 
-  procedure gst_message_parse_step_done(message:PGstMessage; format:PGstFormat; amount:Pguint64; rate:Pgdouble; flush:Pgboolean; 
+  procedure gst_message_parse_step_done(message:PGstMessage; format:PGstFormat; amount:Pguint64; rate:Pgdouble; flush:Pgboolean;
               intermediate:Pgboolean; duration:Pguint64; eos:Pgboolean);cdecl;external gstreamerlib name 'gst_message_parse_step_done';
 
   function gst_message_new_clock_provide(src:PGstObject; clock:PGstClock; ready:Tgboolean):PGstMessage;cdecl;external gstreamerlib name 'gst_message_new_clock_provide';
@@ -183,20 +183,20 @@
 
   procedure gst_message_parse_request_state(message:PGstMessage; state:PGstState);cdecl;external gstreamerlib name 'gst_message_parse_request_state';
 
-  function gst_message_new_step_start(src:PGstObject; active:Tgboolean; format:TGstFormat; amount:Tguint64; rate:Tgdouble; 
+  function gst_message_new_step_start(src:PGstObject; active:Tgboolean; format:TGstFormat; amount:Tguint64; rate:Tgdouble;
              flush:Tgboolean; intermediate:Tgboolean):PGstMessage;cdecl;external gstreamerlib name 'gst_message_new_step_start';
 
-  procedure gst_message_parse_step_start(message:PGstMessage; active:Pgboolean; format:PGstFormat; amount:Pguint64; rate:Pgdouble; 
+  procedure gst_message_parse_step_start(message:PGstMessage; active:Pgboolean; format:PGstFormat; amount:Pguint64; rate:Pgdouble;
               flush:Pgboolean; intermediate:Pgboolean);cdecl;external gstreamerlib name 'gst_message_parse_step_start';
 
-  function gst_message_new_qos(src:PGstObject; live:Tgboolean; running_time:Tguint64; stream_time:Tguint64; timestamp:Tguint64; 
+  function gst_message_new_qos(src:PGstObject; live:Tgboolean; running_time:Tguint64; stream_time:Tguint64; timestamp:Tguint64;
              duration:Tguint64):PGstMessage;cdecl;external gstreamerlib name 'gst_message_new_qos';
 
   procedure gst_message_set_qos_values(message:PGstMessage; jitter:Tgint64; proportion:Tgdouble; quality:Tgint);cdecl;external gstreamerlib name 'gst_message_set_qos_values';
 
   procedure gst_message_set_qos_stats(message:PGstMessage; format:TGstFormat; processed:Tguint64; dropped:Tguint64);cdecl;external gstreamerlib name 'gst_message_set_qos_stats';
 
-  procedure gst_message_parse_qos(message:PGstMessage; live:Pgboolean; running_time:Pguint64; stream_time:Pguint64; timestamp:Pguint64; 
+  procedure gst_message_parse_qos(message:PGstMessage; live:Pgboolean; running_time:Pguint64; stream_time:Pguint64; timestamp:Pguint64;
               duration:Pguint64);cdecl;external gstreamerlib name 'gst_message_parse_qos';
 
   procedure gst_message_parse_qos_values(message:PGstMessage; jitter:Pgint64; proportion:Pgdouble; quality:Pgint);cdecl;external gstreamerlib name 'gst_message_parse_qos_values';

+ 1 - 1
packages/gstreamer/src/gstmeta.inc

@@ -82,7 +82,7 @@ var
 
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function gst_meta_register(api:TGType; impl:Pgchar; size:Tgsize; init_func:TGstMetaInitFunction; free_func:TGstMetaFreeFunction; 
+  function gst_meta_register(api:TGType; impl:Pgchar; size:Tgsize; init_func:TGstMetaInitFunction; free_func:TGstMetaFreeFunction;
              transform_func:TGstMetaTransformFunction):PGstMetaInfo;cdecl;external gstreamerlib name 'gst_meta_register';
 
 (* Const before type ignored *)

+ 1 - 1
packages/gstreamer/src/gstminiobject.inc

@@ -43,7 +43,7 @@
       );
 
 
-  procedure gst_mini_object_init(mini_object:PGstMiniObject; flags:Tguint; _type:TGType; copy_func:TGstMiniObjectCopyFunction; dispose_func:TGstMiniObjectDisposeFunction; 
+  procedure gst_mini_object_init(mini_object:PGstMiniObject; flags:Tguint; _type:TGType; copy_func:TGstMiniObjectCopyFunction; dispose_func:TGstMiniObjectDisposeFunction;
               free_func:TGstMiniObjectFreeFunction);cdecl;external gstreamerlib name 'gst_mini_object_init';
 
   function gst_mini_object_ref(mini_object:PGstMiniObject):PGstMiniObject;cdecl;external gstreamerlib name 'gst_mini_object_ref';

+ 2 - 2
packages/gstreamer/src/gstobject.inc

@@ -108,11 +108,11 @@ function gst_object_check_uniqueness(list:PGList; name:Pgchar):Tgboolean;cdecl;e
   function gst_object_get_value(object_:PGstObject; property_name:Pgchar; timestamp:TGstClockTime):PGValue;cdecl;external gstreamerlib name 'gst_object_get_value';
 
 (* Const before type ignored *)
-  function gst_object_get_value_array(object_:PGstObject; property_name:Pgchar; timestamp:TGstClockTime; interval:TGstClockTime; n_values:Tguint; 
+  function gst_object_get_value_array(object_:PGstObject; property_name:Pgchar; timestamp:TGstClockTime; interval:TGstClockTime; n_values:Tguint;
              values:Tgpointer):Tgboolean;cdecl;external gstreamerlib name 'gst_object_get_value_array';
 
 (* Const before type ignored *)
-  function gst_object_get_g_value_array(object_:PGstObject; property_name:Pgchar; timestamp:TGstClockTime; interval:TGstClockTime; n_values:Tguint; 
+  function gst_object_get_g_value_array(object_:PGstObject; property_name:Pgchar; timestamp:TGstClockTime; interval:TGstClockTime; n_values:Tguint;
              values:PGValue):Tgboolean;cdecl;external gstreamerlib name 'gst_object_get_g_value_array';
 
   function gst_object_get_control_rate(object_:PGstObject):TGstClockTime;cdecl;external gstreamerlib name 'gst_object_get_control_rate';

+ 3 - 3
packages/gstreamer/src/gstplugin.inc

@@ -107,7 +107,7 @@
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function gst_plugin_register_static(major_version:Tgint; minor_version:Tgint; name:Pgchar; description:Pgchar; init_func:TGstPluginInitFunc; 
+  function gst_plugin_register_static(major_version:Tgint; minor_version:Tgint; name:Pgchar; description:Pgchar; init_func:TGstPluginInitFunc;
              version:Pgchar; license:Pgchar; source:Pgchar; package:Pgchar; origin:Pgchar):Tgboolean;cdecl;external gstreamerlib name 'gst_plugin_register_static';
 
 (* Const before type ignored *)
@@ -117,8 +117,8 @@
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function gst_plugin_register_static_full(major_version:Tgint; minor_version:Tgint; name:Pgchar; description:Pgchar; init_full_func:TGstPluginInitFullFunc; 
-             version:Pgchar; license:Pgchar; source:Pgchar; package:Pgchar; origin:Pgchar; 
+  function gst_plugin_register_static_full(major_version:Tgint; minor_version:Tgint; name:Pgchar; description:Pgchar; init_full_func:TGstPluginInitFullFunc;
+             version:Pgchar; license:Pgchar; source:Pgchar; package:Pgchar; origin:Pgchar;
              user_data:Tgpointer):Tgboolean;cdecl;external gstreamerlib name 'gst_plugin_register_static_full';
 
 (* Const before type ignored *)

+ 6 - 6
packages/gstreamer/src/gstpromise.inc

@@ -71,17 +71,17 @@
   {
   static inline GstPromise *
   gst_promise_ref (GstPromise * promise)
-  
+
     return (GstPromise *) gst_mini_object_ref (((GstMiniObject*)(promise)));
-  
+
   # 121 "gstpromise.h"
-  
+
   static inline void
   gst_promise_unref (GstPromise * promise)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(promise)));
-  
-  
+
+
    }
 
 

+ 14 - 14
packages/gstreamer/src/gstquery.inc

@@ -99,44 +99,44 @@
   {
   static inline GstQuery *
   gst_query_ref (GstQuery * q)
-  
+
     return ((GstQuery*)(gst_mini_object_ref (((GstMiniObject*)(q)))));
-  
+
   # 253 "gstquery.h"
   static inline void
   gst_query_unref (GstQuery * q)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(q)));
-  
+
   # 272 "gstquery.h"
   static inline void
   gst_clear_query (GstQuery ** query_ptr)
-  
-    do  _Static_assert (sizeof *(((GstMiniObject **) query_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) query_ptr))) _pp = (((GstMiniObject **) query_ptr)); __typeof__(*(((GstMiniObject **) query_ptr))) _ptr = *_pp; *_pp = 
+
+    do  _Static_assert (sizeof *(((GstMiniObject **) query_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) query_ptr))) _pp = (((GstMiniObject **) query_ptr)); __typeof__(*(((GstMiniObject **) query_ptr))) _ptr = *_pp; *_pp =
   # 275 "gstquery.h" 3 4
    ((void *)0)
   # 275 "gstquery.h"
    ; if (_ptr) (gst_mini_object_unref) (_ptr);  while (0) ;
-  
+
   # 289 "gstquery.h"
   static inline GstQuery *
   gst_query_copy (const GstQuery * q)
-  
+
     return ((GstQuery*)(gst_mini_object_copy (((const GstMiniObject*)(q)))));
-  
+
   # 327 "gstquery.h"
   static inline gboolean
   gst_query_replace (GstQuery **old_query, GstQuery *new_query)
-  
+
     return gst_mini_object_replace ((GstMiniObject **) old_query, (GstMiniObject *) new_query);
-  
+
   # 350 "gstquery.h"
   static inline gboolean
   gst_query_take (GstQuery **old_query, GstQuery *new_query)
-  
+
     return gst_mini_object_take ((GstMiniObject **) old_query,
         (GstMiniObject *) new_query);
-  
+
    }
   function gst_query_new_custom(_type:TGstQueryType; structure:PGstStructure):PGstQuery;cdecl;external gstreamerlib name 'gst_query_new_custom';
 
@@ -241,7 +241,7 @@
   procedure gst_query_parse_nth_allocation_pool(query:PGstQuery; index:Tguint; pool: PPGstBufferPool; size:Pguint; min_buffers:Pguint;
               max_buffers:Pguint);cdecl;external gstreamerlib name 'gst_query_parse_nth_allocation_pool';
 
-  procedure gst_query_set_nth_allocation_pool(query:PGstQuery; index:Tguint; pool:PGstBufferPool; size:Tguint; min_buffers:Tguint; 
+  procedure gst_query_set_nth_allocation_pool(query:PGstQuery; index:Tguint; pool:PGstBufferPool; size:Tguint; min_buffers:Tguint;
               max_buffers:Tguint);cdecl;external gstreamerlib name 'gst_query_set_nth_allocation_pool';
 
   procedure gst_query_remove_nth_allocation_pool(query:PGstQuery; index:Tguint);cdecl;external gstreamerlib name 'gst_query_remove_nth_allocation_pool';

+ 7 - 7
packages/gstreamer/src/gstsample.inc

@@ -73,23 +73,23 @@
   {
   static inline GstSample *
   gst_sample_ref (GstSample * sample)
-  
+
     return ((GstSample *)gst_mini_object_ref (((GstMiniObject*)(sample))))
                  ;
-  
+
   # 113 "gstsample.h"
   static inline void
   gst_sample_unref (GstSample * sample)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(sample)));
-  
-  
+
+
   # 170 "gstsample.h"
   static inline GstSample *
   gst_sample_copy (const GstSample * buf)
-  
+
     return ((GstSample *)gst_mini_object_copy (((const GstMiniObject*)(buf))));
-  
+
    }
 
   var

+ 2 - 2
packages/gstreamer/src/gstsegment.inc

@@ -138,10 +138,10 @@
   function gst_segment_offset_running_time(segment:PGstSegment; format:TGstFormat; offset:Tgint64):Tgboolean;cdecl;external gstreamerlib name 'gst_segment_offset_running_time';
 
 (* Const before type ignored *)
-  function gst_segment_clip(segment:PGstSegment; format:TGstFormat; start:Tguint64; stop:Tguint64; clip_start:Pguint64; 
+  function gst_segment_clip(segment:PGstSegment; format:TGstFormat; start:Tguint64; stop:Tguint64; clip_start:Pguint64;
              clip_stop:Pguint64):Tgboolean;cdecl;external gstreamerlib name 'gst_segment_clip';
 
-  function gst_segment_do_seek(segment:PGstSegment; rate:Tgdouble; format:TGstFormat; flags:TGstSeekFlags; start_type:TGstSeekType; 
+  function gst_segment_do_seek(segment:PGstSegment; rate:Tgdouble; format:TGstFormat; flags:TGstSeekFlags; start_type:TGstSeekType;
              start:Tguint64; stop_type:TGstSeekType; stop:Tguint64; update:Pgboolean):Tgboolean;cdecl;external gstreamerlib name 'gst_segment_do_seek';
 
 (* Const before type ignored *)

+ 23 - 23
packages/gstreamer/src/gsttaglist.inc

@@ -162,13 +162,13 @@ const
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  procedure gst_tag_register(name:Pgchar; flag:TGstTagFlag; _type:TGType; nick:Pgchar; blurb:Pgchar; 
+  procedure gst_tag_register(name:Pgchar; flag:TGstTagFlag; _type:TGType; nick:Pgchar; blurb:Pgchar;
               func:TGstTagMergeFunc);cdecl;external gstreamerlib name 'gst_tag_register';
 
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  procedure gst_tag_register_static(name:Pgchar; flag:TGstTagFlag; _type:TGType; nick:Pgchar; blurb:Pgchar; 
+  procedure gst_tag_register_static(name:Pgchar; flag:TGstTagFlag; _type:TGType; nick:Pgchar; blurb:Pgchar;
               func:TGstTagMergeFunc);cdecl;external gstreamerlib name 'gst_tag_register_static';
 
 (* Const before type ignored *)
@@ -383,52 +383,52 @@ const
   {
   static inline GstTagList *
   gst_tag_list_ref (GstTagList * taglist)
-  
+
     return (GstTagList *) gst_mini_object_ref (((GstMiniObject*)(taglist)));
-  
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
+
   static inline void
   gst_tag_list_unref (GstTagList * taglist)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(taglist)));
-  
+
   # 497 "gsttaglist.h"
   static inline void
   gst_clear_tag_list (GstTagList ** taglist_ptr)
-  
-    do  _Static_assert (sizeof *(((GstMiniObject **) taglist_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) taglist_ptr))) _pp = (((GstMiniObject **) taglist_ptr)); __typeof__(*(((GstMiniObject **) taglist_ptr))) _ptr = *_pp; *_pp = 
+
+    do  _Static_assert (sizeof *(((GstMiniObject **) taglist_ptr)) == sizeof (gpointer), "Expression evaluates to false"); __typeof__((((GstMiniObject **) taglist_ptr))) _pp = (((GstMiniObject **) taglist_ptr)); __typeof__(*(((GstMiniObject **) taglist_ptr))) _ptr = *_pp; *_pp =
   # 500 "gsttaglist.h" 3 4
    ((void *)0)
   # 500 "gsttaglist.h"
    ; if (_ptr) (gst_mini_object_unref) (_ptr);  while (0) ;
-  
+
   # 519 "gsttaglist.h"
   static inline GstTagList *
   gst_tag_list_copy (const GstTagList * taglist)
-  
+
     return ((GstTagList *) (gst_mini_object_copy (((GstMiniObject*)(taglist)))));
-  
+
   # 544 "gsttaglist.h"
   static inline gboolean
   gst_tag_list_replace (GstTagList **old_taglist, GstTagList *new_taglist)
-  
+
       return gst_mini_object_replace ((GstMiniObject **) old_taglist,
           (GstMiniObject *) new_taglist);
-  
+
   # 566 "gsttaglist.h"
   static inline gboolean
   gst_tag_list_take (GstTagList **old_taglist, GstTagList *new_taglist)
-  
+
     return gst_mini_object_take ((GstMiniObject **) old_taglist,
         (GstMiniObject *) new_taglist);
-  
-  
+
+
    }
 
   var

+ 5 - 5
packages/gstreamer/src/gsttoc.inc

@@ -154,15 +154,15 @@
   {
   static inline void
   _gst_autoptr_toc_unref (GstToc *toc)
-  
+
     gst_mini_object_unref(((GstMiniObject*)(toc)));
-  
-  
+
+
   static inline void
   _gst_autoptr_toc_entry_unref (GstTocEntry *entry)
-  
+
     gst_mini_object_unref(((GstMiniObject*)(entry)));
-  
+
    }
 
 

+ 1 - 1
packages/gstreamer/src/gsttypefind.inc

@@ -65,7 +65,7 @@
 
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function gst_type_find_register(plugin:PGstPlugin; name:Pgchar; rank:Tguint; func:TGstTypeFindFunction; extensions:Pgchar; 
+  function gst_type_find_register(plugin:PGstPlugin; name:Pgchar; rank:Tguint; func:TGstTypeFindFunction; extensions:Pgchar;
              possible_caps:PGstCaps; data:Tgpointer; data_notify:TGDestroyNotify):Tgboolean;cdecl;external gstreamerlib name 'gst_type_find_register';
 
 

+ 9 - 9
packages/gstreamer/src/gsturi.inc

@@ -59,7 +59,7 @@
         set_uri : function (handler:PGstURIHandler; uri:Pgchar; error:PPGError):Tgboolean;cdecl;
       end;
 
-      
+
     T_GstUri = record
         {undefined structure}
       end;
@@ -129,7 +129,7 @@
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function gst_uri_new(scheme:Pgchar; userinfo:Pgchar; host:Pgchar; port:Tguint; path:Pgchar; 
+  function gst_uri_new(scheme:Pgchar; userinfo:Pgchar; host:Pgchar; port:Tguint; path:Pgchar;
              query:Pgchar; fragment:Pgchar):PGstUri;cdecl;external gstreamerlib name 'gst_uri_new';
 
 (* Const before type ignored *)
@@ -138,7 +138,7 @@
 (* Const before type ignored *)
 (* Const before type ignored *)
 (* Const before type ignored *)
-  function gst_uri_new_with_base(base:PGstUri; scheme:Pgchar; userinfo:Pgchar; host:Pgchar; port:Tguint; 
+  function gst_uri_new_with_base(base:PGstUri; scheme:Pgchar; userinfo:Pgchar; host:Pgchar; port:Tguint;
              path:Pgchar; query:Pgchar; fragment:Pgchar):PGstUri;cdecl;external gstreamerlib name 'gst_uri_new_with_base';
 
 (* Const before type ignored *)
@@ -262,21 +262,21 @@
   {
   static inline GstUri *
   gst_uri_copy (const GstUri * uri)
-  
+
     return ((GstUri *)(gst_mini_object_copy (((const GstMiniObject*)(uri)))));
-  
+
   # 373 "gsturi.h"
   static inline GstUri *
   gst_uri_ref (GstUri * uri)
-  
+
     return ((GstUri *)(gst_mini_object_ref (((GstMiniObject*)(uri)))));
-  
+
   # 389 "gsturi.h"
   static inline void
   gst_uri_unref (GstUri * uri)
-  
+
     gst_mini_object_unref (((GstMiniObject*)(uri)));
-  
+
    }
 
 

+ 74 - 74
packages/gstreamer/src/gstutils.inc

@@ -80,185 +80,185 @@ type
   function gst_util_group_id_next:Tguint;cdecl;external gstreamerlib name 'gst_util_group_id_next';
 
   {
-  static inline guint16 __gst_fast_read16(const guint8 *v) 
+  static inline guint16 __gst_fast_read16(const guint8 *v)
     return *(const guint16*)(const void*)(v);
-  
-  static inline guint32 __gst_fast_read32(const guint8 *v) 
+
+  static inline guint32 __gst_fast_read32(const guint8 *v)
     return *(const guint32*)(const void*)(v);
-  
-  static inline guint64 __gst_fast_read64(const guint8 *v) 
+
+  static inline guint64 __gst_fast_read64(const guint8 *v)
     return *(const guint64*)(const void*)(v);
-  
-  static inline guint16 __gst_fast_read_swap16(const guint8 *v) 
+
+  static inline guint16 __gst_fast_read_swap16(const guint8 *v)
     return (((guint16) ( (guint16) ((guint16) (*(const guint16*)(const void*)(v)) >> 8) | (guint16) ((guint16) (*(const guint16*)(const void*)(v)) << 8))));
-  
-  static inline guint32 __gst_fast_read_swap32(const guint8 *v) 
+
+  static inline guint32 __gst_fast_read_swap32(const guint8 *v)
     return (((guint32) ( (((guint32) (*(const guint32*)(const void*)(v)) & (guint32) 0x000000ffU) << 24) | (((guint32) (*(const guint32*)(const void*)(v)) & (guint32) 0x0000ff00U) << 8) | (((guint32) (*(const guint32*)(const void*)(v)) & (guint32) 0x00ff0000U) >> 8) | (((guint32) (*(const guint32*)(const void*)(v)) & (guint32) 0xff000000U) >> 24))));
-  
-  static inline guint64 __gst_fast_read_swap64(const guint8 *v) 
+
+  static inline guint64 __gst_fast_read_swap64(const guint8 *v)
     return (((guint64) ( (((guint64) (*(const guint64*)(const void*)(v)) & (guint64) (0x00000000000000ffUL)) << 56) | (((guint64) (*(const guint64*)(const void*)(v)) & (guint64) (0x000000000000ff00UL)) << 40) | (((guint64) (*(const guint64*)(const void*)(v)) & (guint64) (0x0000000000ff0000UL)) << 24) | (((guint64) (*(const guint64*)(const void*)(v)) & (guint64) (0x00000000ff000000UL)) << 8) | (((guint64) (*(const guint64*)(const void*)(v)) & (guint64) (0x000000ff00000000UL)) >> 8) | (((guint64) (*(const guint64*)(const void*)(v)) & (guint64) (0x0000ff0000000000UL)) >> 24) | (((guint64) (*(const guint64*)(const void*)(v)) & (guint64) (0x00ff000000000000UL)) >> 40) | (((guint64) (*(const guint64*)(const void*)(v)) & (guint64) (0xff00000000000000UL)) >> 56))));
-  
-  
-  
-  
-  static inline void __gst_fast_write16 (guint8 *p, guint16 v) 
+
+
+
+
+  static inline void __gst_fast_write16 (guint8 *p, guint16 v)
     *(guint16*)(void*)(p) = v;
-  
-  static inline void __gst_fast_write32 (guint8 *p, guint32 v) 
+
+  static inline void __gst_fast_write32 (guint8 *p, guint32 v)
     *(guint32*)(void*)(p) = v;
-  
-  static inline void __gst_fast_write64 (guint8 *p, guint64 v) 
+
+  static inline void __gst_fast_write64 (guint8 *p, guint64 v)
     *(guint64*)(void*)(p) = v;
-  
-  static inline void __gst_fast_write_swap16 (guint8 *p, guint16 v) 
+
+  static inline void __gst_fast_write_swap16 (guint8 *p, guint16 v)
     *(guint16*)(void*)(p) = (((guint16) ( (guint16) ((guint16) (v) >> 8) | (guint16) ((guint16) (v) << 8))));
-  
-  static inline void __gst_fast_write_swap32 (guint8 *p, guint32 v) 
+
+  static inline void __gst_fast_write_swap32 (guint8 *p, guint32 v)
     *(guint32*)(void*)(p) = (((guint32) ( (((guint32) (v) & (guint32) 0x000000ffU) << 24) | (((guint32) (v) & (guint32) 0x0000ff00U) << 8) | (((guint32) (v) & (guint32) 0x00ff0000U) >> 8) | (((guint32) (v) & (guint32) 0xff000000U) >> 24))));
-  
-  static inline void __gst_fast_write_swap64 (guint8 *p, guint64 v) 
+
+  static inline void __gst_fast_write_swap64 (guint8 *p, guint64 v)
     *(guint64*)(void*)(p) = (((guint64) ( (((guint64) (v) & (guint64) (0x00000000000000ffUL)) << 56) | (((guint64) (v) & (guint64) (0x000000000000ff00UL)) << 40) | (((guint64) (v) & (guint64) (0x0000000000ff0000UL)) << 24) | (((guint64) (v) & (guint64) (0x00000000ff000000UL)) << 8) | (((guint64) (v) & (guint64) (0x000000ff00000000UL)) >> 8) | (((guint64) (v) & (guint64) (0x0000ff0000000000UL)) >> 24) | (((guint64) (v) & (guint64) (0x00ff000000000000UL)) >> 40) | (((guint64) (v) & (guint64) (0xff00000000000000UL)) >> 56))));
-  
+
   # 321 "gstutils.h"
-  static inline guint32 __gst_slow_read24_be (const guint8 * data) 
+  static inline guint32 __gst_slow_read24_be (const guint8 * data)
     return ((((guint32) (((const guint8 *) (data))[0])) << (16)) | (((guint32) (((const guint8 *) (data))[1])) << (8)) | (((guint32) (((const guint8 *) (data))[2])) << (0)));
-  
+
   # 336 "gstutils.h"
-  static inline guint32 __gst_slow_read24_le (const guint8 * data) 
+  static inline guint32 __gst_slow_read24_le (const guint8 * data)
     return ((((guint32) (((const guint8 *) (data))[2])) << (16)) | (((guint32) (((const guint8 *) (data))[1])) << (8)) | (((guint32) (((const guint8 *) (data))[0])) << (0)));
-  
+
   # 568 "gstutils.h"
   static inline gfloat
   GFLOAT_SWAP_LE_BE(gfloat in)
-  
+
     union
-    
+
       guint32 i;
       gfloat f;
      u;
-  
+
     u.f = in;
     u.i = (((guint32) ( (((guint32) (u.i) & (guint32) 0x000000ffU) << 24) | (((guint32) (u.i) & (guint32) 0x0000ff00U) << 8) | (((guint32) (u.i) & (guint32) 0x00ff0000U) >> 8) | (((guint32) (u.i) & (guint32) 0xff000000U) >> 24))));
     return u.f;
-  
+
   # 590 "gstutils.h"
   static inline gdouble
   GDOUBLE_SWAP_LE_BE(gdouble in)
-  
+
     union
-    
+
       guint64 i;
       gdouble d;
      u;
-  
+
     u.d = in;
     u.i = (((guint64) ( (((guint64) (u.i) & (guint64) (0x00000000000000ffUL)) << 56) | (((guint64) (u.i) & (guint64) (0x000000000000ff00UL)) << 40) | (((guint64) (u.i) & (guint64) (0x0000000000ff0000UL)) << 24) | (((guint64) (u.i) & (guint64) (0x00000000ff000000UL)) << 8) | (((guint64) (u.i) & (guint64) (0x000000ff00000000UL)) >> 8) | (((guint64) (u.i) & (guint64) (0x0000ff0000000000UL)) >> 24) | (((guint64) (u.i) & (guint64) (0x00ff000000000000UL)) >> 40) | (((guint64) (u.i) & (guint64) (0xff00000000000000UL)) >> 56))));
     return u.d;
-  
+
   # 693 "gstutils.h"
   static inline gfloat
   GST_READ_FLOAT_LE(const guint8 *data)
-  
+
     union
-    
+
       guint32 i;
       gfloat f;
      u;
-  
+
     u.i = __gst_fast_read32((const guint8 *)(data));
     return u.f;
-  
+
   # 714 "gstutils.h"
   static inline gfloat
   GST_READ_FLOAT_BE(const guint8 *data)
-  
+
     union
-    
+
       guint32 i;
       gfloat f;
      u;
-  
+
     u.i = __gst_fast_read_swap32((const guint8 *)(data));
     return u.f;
-  
+
   # 735 "gstutils.h"
   static inline gdouble
   GST_READ_DOUBLE_LE(const guint8 *data)
-  
+
     union
-    
+
       guint64 i;
       gdouble d;
      u;
-  
+
     u.i = __gst_fast_read64((const guint8 *)(data));
     return u.d;
-  
+
   # 756 "gstutils.h"
   static inline gdouble
   GST_READ_DOUBLE_BE(const guint8 *data)
-  
+
     union
-    
+
       guint64 i;
       gdouble d;
      u;
-  
+
     u.i = __gst_fast_read_swap64((const guint8 *)(data));
     return u.d;
-  
+
   # 776 "gstutils.h"
   static inline void
   GST_WRITE_FLOAT_LE(guint8 *data, gfloat num)
-  
+
     union
-    
+
       guint32 i;
       gfloat f;
      u;
-  
+
     u.f = num;
     __gst_fast_write32((guint8 *)(data), (u.i));
-  
+
   # 796 "gstutils.h"
   static inline void
   GST_WRITE_FLOAT_BE(guint8 *data, gfloat num)
-  
+
     union
-    
+
       guint32 i;
       gfloat f;
      u;
-  
+
     u.f = num;
     __gst_fast_write_swap32((guint8 *)(data), (u.i));
-  
+
   # 816 "gstutils.h"
   static inline void
   GST_WRITE_DOUBLE_LE(guint8 *data, gdouble num)
-  
+
     union
-    
+
       guint64 i;
       gdouble d;
      u;
-  
+
     u.d = num;
     __gst_fast_write64((guint8 *)(data), (u.i));
-  
+
   # 836 "gstutils.h"
   static inline void
   GST_WRITE_DOUBLE_BE(guint8 *data, gdouble num)
-  
+
     union
-    
+
       guint64 i;
       gdouble d;
      u;
-  
+
     u.d = num;
     __gst_fast_write_swap64((guint8 *)(data), (u.i));
-  
+
    }
 (* Const before type ignored *)
 (* Const before type ignored *)
@@ -408,16 +408,16 @@ type
 
   procedure gst_util_double_to_fraction(src:Tgdouble; dest_n:Pgint; dest_d:Pgint);cdecl;external gstreamerlib name 'gst_util_double_to_fraction';
 
-  function gst_util_fraction_multiply(a_n:Tgint; a_d:Tgint; b_n:Tgint; b_d:Tgint; res_n:Pgint; 
+  function gst_util_fraction_multiply(a_n:Tgint; a_d:Tgint; b_n:Tgint; b_d:Tgint; res_n:Pgint;
              res_d:Pgint):Tgboolean;cdecl;external gstreamerlib name 'gst_util_fraction_multiply';
 
-  function gst_util_fraction_add(a_n:Tgint; a_d:Tgint; b_n:Tgint; b_d:Tgint; res_n:Pgint; 
+  function gst_util_fraction_add(a_n:Tgint; a_d:Tgint; b_n:Tgint; b_d:Tgint; res_n:Pgint;
              res_d:Pgint):Tgboolean;cdecl;external gstreamerlib name 'gst_util_fraction_add';
 
   function gst_util_fraction_compare(a_n:Tgint; a_d:Tgint; b_n:Tgint; b_d:Tgint):Tgint;cdecl;external gstreamerlib name 'gst_util_fraction_compare';
 
 (* Const before type ignored *)
-  function gst_calculate_linear_regression(xy:PGstClockTime; temp:PGstClockTime; n:Tguint; m_num:PGstClockTime; m_denom:PGstClockTime; 
+  function gst_calculate_linear_regression(xy:PGstClockTime; temp:PGstClockTime; n:Tguint; m_num:PGstClockTime; m_denom:PGstClockTime;
              b:PGstClockTime; xbase:PGstClockTime; r_squared:Pgdouble):Tgboolean;cdecl;external gstreamerlib name 'gst_calculate_linear_regression';
 
 

+ 10 - 10
packages/gtk1/README.txt

@@ -8,7 +8,7 @@ In order for the makefile to work, you NEED the following file:
   makefile.fpc
 and it MUST be located in the directory above this directory.
 
-If you have this file on another place in your directory tree, just 
+If you have this file on another place in your directory tree, just
 set the FPCDIR variable so it points to that directory.
   (e.g. FPCDIR=/usr/lib/fpc/0.99.13; export FPCDIR in bash, or
         SETENV FPCDIR /usr/lib/fpc/0.99.13 in csh)
@@ -16,7 +16,7 @@ set the FPCDIR variable so it points to that directory.
 If you don't have this file, you can get it from
   ftp://tflily.fys.kuleuven.ac.be/pub/fpc/source/base.zip
 or one of the mirrors.
- 
+
 Compiling the units:
 --------------------
 
@@ -44,25 +44,25 @@ Using the units:
      In gtkobject, names also have been kept.
      In all other files, types have been prepended with T, that is, the C
      type 'GtkWidget' has become 'TGtkWidget'
-     
+
      This is annoying, but C is case sensitive, and Pascal is not, so
      there you have it...
-     
+
      When translating, I've tried to stick to this scheme as closely as I
      could. One day, however, all will be done in a uniform manner...
 
-3) Macros. Many C macros have not been translated. The typecasting macros 
+3) Macros. Many C macros have not been translated. The typecasting macros
    have been dropped, since they're useless under pascal.
-   Macros to access record members have been translated, BUT they are 
+   Macros to access record members have been translated, BUT they are
    to be considered as READ-ONLY. So they can be used to retrieve a value,
    but not to store one.
    e.g.
       function GTK_WIDGET_FLAGS(wid : pgtkwidget) : longint;
    can be used to retrieve the widget flags, but not to set them.
-   so things like 
+   so things like
      GTK_WIDGET_FLAGS(wid):=GTK_WIDGET_FLAGS(wid) and someflag;
    will not work, since this is a function, and NOT a macro as in C.
-  
+
 4) Packed records. GCC allows you to specify members of a record in
    bit format. Since this is impossible in pascal, functions and procedures
    to get/set these elements have been made.
@@ -73,8 +73,8 @@ Using the units:
    in general, it's the name with '_set' appended for getting a value
    (set from 'a set') , and  'set_' prepended (from 'to set') and again
    '_set' appended.
-   
-   
+
+
 And that is about all there is to say about it.
 
 Enjoy !

+ 3 - 3
packages/gtk2/fpmake.pp

@@ -1236,7 +1236,7 @@ begin
           AddInclude('pango-matrix.inc');
           AddInclude('pango-renderer.inc');
         end;
-    
+
     T:=P.Targets.AddImplicitUnit('src/pangocairo/pangocairo.pas');
       T.IncludePath.Add('src/pangocairo');
 
@@ -1248,8 +1248,8 @@ begin
           AddInclude('gtkstatusicon.inc');
 	  AddInclude('gtkscalebuttonh.inc');
 	  AddInclude('gtkscalebutton.inc');
-	  AddInclude('gtkvolumebuttonh.inc');	  
-	  AddInclude('gtkvolumebutton.inc');	  
+	  AddInclude('gtkvolumebuttonh.inc');
+	  AddInclude('gtkvolumebutton.inc');
 	  AddInclude('gtktextmarkh.inc');
 	  AddInclude('gtktextmark.inc');
 	  AddInclude('gtktextiterh.inc');

+ 2 - 2
packages/gtk2/src/buildgtk2.pp

@@ -29,14 +29,14 @@ interface
 {$IFDEF FPC_DOTTEDUNITS}
 uses
   Api.Gtk2.Gtk2, Api.Glade2,Api.Gtk2.Gdkglext,Api.Gtk2.Gtkglext, Api.Gtk2.Gtk2ext
-{$ifdef Unix}  
+{$ifdef Unix}
   ,Api.Gtk2.Gdk2x
 {$endif Unix}
   , Api.Pangocairo;
 {$ELSE FPC_DOTTEDUNITS}
 uses
   gtk2, libglade2,gdkglext,gtkglext, gtk2ext
-{$ifdef unix}  
+{$ifdef unix}
   ,gdk2x
 {$endif unix}
   , pangocairo;

+ 1 - 1
packages/gtk2/src/glib/gclosure.inc

@@ -24,7 +24,7 @@
         callback : gpointer;
      end;
 
-   TGCallBackProcedure = procedure; 
+   TGCallBackProcedure = procedure;
    TGCallback = procedure (para1: TGCallBackProcedure); cdecl;
 
    TGClosureMarshal = procedure (closure:PGClosure; return_value:PGValue; n_param_values:guint; param_values:PGValue; invocation_hint:gpointer;

+ 2 - 2
packages/gtk2/src/glib/gdate.inc

@@ -47,12 +47,12 @@
 {$ENDIF read_interface_types}
 
 {$IFDEF read_interface_rest}
-const 
+const
   G_DATE_DAY = 0;
   G_DATE_MONTH = 1;
   G_DATE_YEAR = 2;
 
-const 
+const
   G_DATE_BAD_WEEKDAY = 0;
   G_DATE_MONDAY = 1;
   G_DATE_TUESDAY = 2;

+ 1 - 1
packages/gtk2/src/glib/gnode.inc

@@ -17,7 +17,7 @@
 
   PGTraverseFlags = ^TGTraverseFlags;
   TGTraverseFlags = gint;
-  
+
   PGTraverseType = ^TGTraverseType;
   TGTraverseType = (
     G_IN_ORDER,

+ 2 - 2
packages/gtk2/src/glib/goption.inc

@@ -7,7 +7,7 @@
 
 {$IFDEF read_interface_types}
    PGOptionContext = ^TGOptionContext;
-   TGOptionContext = record 
+   TGOptionContext = record
    end;
 
    PGOptionGroup = ^TGOptionGroup;
@@ -65,7 +65,7 @@
 
 {$IFDEF read_interface_rest}
 const
-   G_OPTION_REMAINING = '';   
+   G_OPTION_REMAINING = '';
 
 function G_OPTION_ERROR : GType;
 

+ 2 - 2
packages/gtk2/src/gtk+/gdk/gdkdisplay.inc

@@ -25,7 +25,7 @@
         button_number : array[0..1] of guint;
         double_click_time : guint;
         core_pointer: PGdkDevice;
-        pointer_hooks: PGdkDisplayPointerHooks;  
+        pointer_hooks: PGdkDisplayPointerHooks;
         closed: guint;
         double_click_distance: guint;
         button_x: array[0..1] of guint;
@@ -84,7 +84,7 @@ function gdk_display_get_core_pointer(display:PGdkDisplay): PGdkDevice; cdecl; e
 procedure gdk_display_get_pointer(display:PGdkDisplay; screen :PGdkScreen; x :Pgint; y : Pgint; mask : PGdkModifierType); cdecl; external gdklib;
 function gdk_display_get_window_at_pointer(display:PGdkDisplay; win_x: Pgint; win_y: Pgint): PGdkWindow; cdecl; external gdklib;
 function gdk_display_set_pointer_hooks(display: PGdkDisplay; new_hooks: PGdkDisplayPointerHooks): PGdkDisplayPointerHooks; cdecl; external gdklib;
-// 2.4 
+// 2.4
 procedure gdk_display_flush(display: PGdkDisplay); cdecl; external gdklib;
 function gdk_display_get_default_cursor_size(display: PGdkDisplay): guint; cdecl; external gdklib;
 procedure gdk_display_get_maximal_cursor_size(display: PGdkDisplay; w, h: pguint); cdecl; external gdklib;

+ 1 - 1
packages/gtk2/src/gtk+/gdk/gdkdrawable.inc

@@ -76,7 +76,7 @@
         _gdk_reserved15 : procedure ; cdecl;
         _gdk_reserved16 : procedure ; cdecl;
      end;
-    
+
    PGdkTrapezoid = ^TGdkTrapezoid;
    TGdkTrapezoid = record
         y1 : double;

+ 2 - 2
packages/gtk2/src/gtk+/gdk/gdkpango.inc

@@ -22,14 +22,14 @@
      // private
      parent_class: TPangoRendererClass;
    end;
-   
+
    TGdkPangoRendererPrivate = record
      screen: PGdkScreen;
 
      // GdkPangoRenderer specific state
      override_color: array[TPangoRenderPart] of TPangoColor;
      override_color_set: array[TPangoRenderPart] of gboolean;
-     
+
      stipple: array[TPangoRenderPart] of PGdkBitmap;
      emboss_color: TPangoColor;
      embossed: gboolean;

+ 5 - 5
packages/gtk2/src/gtk+/gtk/gtkcellrenderercombo.inc

@@ -48,27 +48,27 @@
     begin
       Result:= gtk_cell_renderer_combo_get_type ();
     end;
-    
+
     function GTK_CELL_RENDERER_COMBO(obj: Pointer): PGtkCellRendererCombo;
     begin
       Result:= PGtkCellRendererCombo(GTK_CHECK_CAST(obj, GTK_TYPE_CELL_RENDERER_COMBO));
     end;
-    
+
     function GTK_CELL_RENDERER_COMBO_CLASS(klass: pointer): PGtkCellRendererComboClass;
     begin
       Result:= PGtkCellRendererComboClass(GTK_CHECK_CLASS_CAST(klass, GTK_TYPE_CELL_RENDERER_COMBO));
     end;
-     
+
     function GTK_IS_CELL_RENDERER_COMBO(obj: pointer): boolean;
     begin
       Result:= GTK_CHECK_TYPE(obj, GTK_TYPE_CELL_RENDERER_COMBO);
     end;
-    
+
     function GTK_IS_CELL_RENDERER_COMBO_CLASS(klass: pointer):boolean;
     begin
       Result:= GTK_CHECK_CLASS_TYPE(klass, GTK_TYPE_CELL_RENDERER_COMBO);
     end;
-    
+
     function GTK_CELL_RENDERER_COMBO_GET_CLASS(obj: pointer): PGtkCellRendererComboClass;
     begin
       Result:= PGtkCellRendererComboClass(GTK_CHECK_GET_CLASS(obj, GTK_TYPE_CELL_RENDERER_COMBO));

+ 5 - 5
packages/gtk2/src/gtk+/gtk/gtkcellrendererprogress.inc

@@ -49,27 +49,27 @@
     begin
       Result:= gtk_cell_renderer_progress_get_type ();
     end;
-    
+
     function GTK_CELL_RENDERER_PROGRESS(obj: Pointer): PGtkCellRendererProgress;
     begin
       Result:= PGtkCellRendererProgress(GTK_CHECK_CAST(obj, GTK_TYPE_CELL_RENDERER_PROGRESS));
     end;
-    
+
     function GTK_CELL_RENDERER_PROGRESS_CLASS(klass: pointer): PGtkCellRendererProgressClass;
     begin
       Result:= PGtkCellRendererProgressClass(GTK_CHECK_CLASS_CAST(klass, GTK_TYPE_CELL_RENDERER_PROGRESS));
     end;
-     
+
     function GTK_IS_CELL_RENDERER_PROGRESS(obj: pointer): boolean;
     begin
       Result:= GTK_CHECK_TYPE(obj, GTK_TYPE_CELL_RENDERER_PROGRESS);
     end;
-    
+
     function GTK_IS_CELL_RENDERER_PROGRESS_CLASS(klass: pointer):boolean;
     begin
       Result:= GTK_CHECK_CLASS_TYPE(klass, GTK_TYPE_CELL_RENDERER_PROGRESS);
     end;
-    
+
     function GTK_CELL_RENDERER_PROGRESS_GET_CLASS(obj: pointer): PGtkCellRendererProgressClass;
     begin
       Result:= PGtkCellRendererProgressClass(GTK_CHECK_GET_CLASS(obj, GTK_TYPE_CELL_RENDERER_PROGRESS));

+ 2 - 2
packages/gtk2/src/gtk+/gtk/gtkliststore.inc

@@ -85,11 +85,11 @@ function gtk_list_store_iter_is_valid(list_store:PGtkListStore; iter:PGtkTreeIte
 procedure gtk_list_store_move_after(list_store:PGtkListStore; iter:PGtkTreeIter; position: PGtkTreeIter); cdecl; external gtklib;
 procedure gtk_list_store_move_before(list_store:PGtkListStore; iter:PGtkTreeIter; position: PGtkTreeIter); cdecl; external gtklib;
 procedure gtk_list_store_reorder(list_store:PGtkListStore; new_order:Pgint); cdecl; external gtklib;
-procedure gtk_list_store_swap(list_store:PGtkListStore; a:PGtkTreeIter; b:PGtkTreeIter); cdecl; external gtklib; 
+procedure gtk_list_store_swap(list_store:PGtkListStore; a:PGtkTreeIter; b:PGtkTreeIter); cdecl; external gtklib;
 {$ENDIF}
 
 {$ifdef HasGTK2_6}
-procedure gtk_list_store_insert_with_values(list_store:PGtkListStore; iter:PGtkTreeIter; position:gint); varargs;cdecl; external gtklib; 
+procedure gtk_list_store_insert_with_values(list_store:PGtkListStore; iter:PGtkTreeIter; position:gint); varargs;cdecl; external gtklib;
 procedure gtk_list_store_insert_with_valuesv(list_store:PGtkListStore; iter:PGtkTreeIter; position:gint; columns:Pgint; values:PGValue; n_values:gint);cdecl; external gtklib;
 {$endif}
 

+ 1 - 1
packages/gtk2/src/gtk+/gtk/gtkmain.inc

@@ -125,7 +125,7 @@ function _gtk_get_module_path(_type:Pgchar):PPgchar; cdecl; external gtklib;
 
 {$ifdef HasGTK2_6}
 function gtk_get_option_group(open_default_display:gboolean):PGOptionGroup; cdecl; external gtklib;
-function gtk_init_with_args(argc:PLongint; argv:PPPAnsiChar; parameter_string:PAnsiChar; 
+function gtk_init_with_args(argc:PLongint; argv:PPPAnsiChar; parameter_string:PAnsiChar;
   entries:PGOptionEntry; translation_domain:PAnsiChar; error:PPGError):gboolean; cdecl; external gtklib;
 {$endif}
 

+ 1 - 1
packages/gtk2/src/gtk+/gtk/gtkmessagedialog.inc

@@ -72,7 +72,7 @@ function gtk_message_dialog_new(parent:PGtkWindow; flags:TGtkDialogFlags;
 
 {$ifdef HasGTK2_4}
 function gtk_message_dialog_new_with_markup(parent: PGtkWindow; flags: TGtkDialogFlags;
-  _type: TGtkMessageType; buttons: TGtkButtonsType; 
+  _type: TGtkMessageType; buttons: TGtkButtonsType;
   message_format: Pgchar): PGtkWidget; varargs; cdecl; external gtklib;
 procedure gtk_message_dialog_set_markup(message_dialog: PGtkMessageDialog; str:Pgchar); cdecl; external gtklib;
 {$endif}

+ 2 - 2
packages/gtk2/src/gtk2x11/include/gdkinputprivate.inc

@@ -79,7 +79,7 @@ type
         num_obscuring : gint;
         grabbed : gint;
      end;
-     
+
 { Global data  }
 // Private function GDK_IS_CORE(d : pointer) : boolean;
 
@@ -123,7 +123,7 @@ function gdk_input_common_init(display:PGdkDisplay; include_core:gint):gint;cdec
 
 function gdk_input_find_device(display:PGdkDisplay; id:guint32):PGdkDevicePrivate;cdecl;external;
 
-procedure gdk_input_get_root_relative_geometry(display:PDisplay; w:TWindow; x_ret:Plongint; y_ret:Plongint; width_ret:Plongint; 
+procedure gdk_input_get_root_relative_geometry(display:PDisplay; w:TWindow; x_ret:Plongint; y_ret:Plongint; width_ret:Plongint;
             height_ret:Plongint);cdecl;external;
 
 procedure gdk_input_common_find_events(window:PGdkWindow; gdkdev:PGdkDevicePrivate; mask:gint; classes:Pointer {PXEventClass}; num_classes:Plongint);cdecl;external;

+ 1 - 1
packages/gtk2/src/gtk2x11/include/gdkprivate-x11.inc

@@ -8,7 +8,7 @@
      blue: word;
      alpha: word;
    end;
-   
+
    PPXRectangle = ^PXRectangle;
 {$ENDIF read_forward_definitions}
 

+ 1 - 1
packages/gtk2/src/gtk2x11/include/xsettings-client.inc

@@ -3,7 +3,7 @@
 type
   PXSettingsAction = ^TXSettingsAction;
   TXSettingsAction =  Longint;
-  
+
 Const
   XSETTINGS_ACTION_NEW = 0;
   XSETTINGS_ACTION_CHANGED = 1;

+ 2 - 2
packages/gtk2/src/gtkext/gtk2ext.pp

@@ -13,7 +13,7 @@ uses
 uses
   glib2, gdk2, gdk2pixbuf, gtk2;
 {$ENDIF FPC_DOTTEDUNITS}
-  
+
 const
   { This is equired when people don't have -dev/-devel packages on linux.
     I'm not sure how Darwin is handled tho }
@@ -26,7 +26,7 @@ const
     GtkLibNames: array[1..2] of ansistring = (gtklib, gtklib + '.0');
     {$endif}
   {$endif}
-  
+
 {$i gtkstatusiconh.inc}
 {$i gtkscalebuttonh.inc}
 {$i gtkvolumebuttonh.inc}

+ 16 - 16
packages/gtk2/src/gtkglext/gdkglenumtypes.inc

@@ -8,7 +8,7 @@
 
     #define \(.*\) (\(.*\)())
   to
-    function \1: GType; 
+    function \1: GType;
       cdecl; external GdkGLExtLib name '\2';
 }
 
@@ -17,65 +17,65 @@
 {* enumerations from "gdkgltokens.h" *}
 
 function gdk_gl_config_attrib_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_CONFIG_ATTRIB: GType; 
+function GDK_TYPE_GL_CONFIG_ATTRIB: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_config_attrib_get_type';
 
 function gdk_gl_config_caveat_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_CONFIG_CAVEAT: GType; 
+function GDK_TYPE_GL_CONFIG_CAVEAT: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_config_caveat_get_type';
 
 function gdk_gl_visual_type_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_VISUAL_TYPE: GType; 
+function GDK_TYPE_GL_VISUAL_TYPE: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_visual_type_get_type';
 
 function gdk_gl_transparent_type_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_TRANSPARENT_TYPE: GType; 
+function GDK_TYPE_GL_TRANSPARENT_TYPE: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_transparent_type_get_type';
 
 function gdk_gl_drawable_type_mask_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_DRAWABLE_TYPE_MASK: GType; 
+function GDK_TYPE_GL_DRAWABLE_TYPE_MASK: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_drawable_type_mask_get_type';
 
 function gdk_gl_render_type_mask_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_RENDER_TYPE_MASK: GType; 
+function GDK_TYPE_GL_RENDER_TYPE_MASK: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_render_type_mask_get_type';
 
 function gdk_gl_buffer_mask_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_BUFFER_MASK: GType; 
+function GDK_TYPE_GL_BUFFER_MASK: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_buffer_mask_get_type';
 
 function gdk_gl_config_error_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_CONFIG_ERROR: GType; 
+function GDK_TYPE_GL_CONFIG_ERROR: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_config_error_get_type';
 
 function gdk_gl_render_type_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_RENDER_TYPE: GType; 
+function GDK_TYPE_GL_RENDER_TYPE: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_render_type_get_type';
 
 function gdk_gl_drawable_attrib_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_DRAWABLE_ATTRIB: GType; 
+function GDK_TYPE_GL_DRAWABLE_ATTRIB: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_drawable_attrib_get_type';
 
 function gdk_gl_pbuffer_attrib_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_PBUFFER_ATTRIB: GType; 
+function GDK_TYPE_GL_PBUFFER_ATTRIB: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_pbuffer_attrib_get_type';
 
 function gdk_gl_event_mask_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_EVENT_MASK: GType; 
+function GDK_TYPE_GL_EVENT_MASK: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_event_mask_get_type';
 
 function gdk_gl_event_type_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_EVENT_TYPE: GType; 
+function GDK_TYPE_GL_EVENT_TYPE: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_event_type_get_type';
 
 function gdk_gl_drawable_type_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_DRAWABLE_TYPE: GType; 
+function GDK_TYPE_GL_DRAWABLE_TYPE: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_drawable_type_get_type';
 
 {* enumerations from "gdkglconfig.h" *}
 
 function gdk_gl_config_mode_get_type: GType; cdecl; external GdkGLExtLib;
-function GDK_TYPE_GL_CONFIG_MODE: GType; 
+function GDK_TYPE_GL_CONFIG_MODE: GType;
   cdecl; external GdkGLExtLib name 'gdk_gl_config_mode_get_type';
 
 {$endif read_interface_rest}

+ 2 - 2
packages/gtk2/src/gtkglext/gdkglext.pas

@@ -37,9 +37,9 @@ uses Glib2, Gdk2;
 {$ENDIF FPC_DOTTEDUNITS}
 
 const
-  GdkGLExtLib = 
+  GdkGLExtLib =
     {$ifdef WINDOWS} 'libgdkglext-win32-1.0-0.dll'
-    {$else}        
+    {$else}
       {$ifdef DARWIN}
         'gdkglext-x11-1.0'
         {$linklib gdkglext-x11-1.0}

+ 2 - 2
packages/gtk2/src/gtkglext/gdkglpixmap.inc

@@ -3,7 +3,7 @@
 {$ifdef read_interface_types}
 
   { PGdkGLPixmap already defined in gdkgltypes.inc }
-  
+
   TGdkGLPixmap = record
     parent_instance: TGObject;
     drawable: PGdkDrawable;        {* Associated GdkPixmap *}
@@ -46,7 +46,7 @@ function gdk_gl_pixmap_get_pixmap(glpixmap: PGdkGLPixmap): PGdkPixmap;
 {*
  * OpenGL extension to GdkPixmap
  *}
- 
+
 function gdk_pixmap_set_gl_capability(
   pixmap: PGdkPixmap;
   glconfig: PGdkGLConfig;

+ 2 - 2
packages/gtk2/src/gtkglext/gdkglwindow.inc

@@ -3,7 +3,7 @@
 {$ifdef read_interface_types}
 
   { PGdkGLWindow already defined in gdkgltypes.inc }
-  
+
   TGdkGLWindow = record
     parent_instance: TGObject;
     drawable: PGdkDrawable;        {* Associated GdkWindow *}
@@ -103,7 +103,7 @@ end;
 
 function gdk_window_get_gl_drawable(window: PGdkWindow): PGdkGLDrawable;
 begin
- gdk_window_get_gl_drawable := 
+ gdk_window_get_gl_drawable :=
    GDK_GL_DRAWABLE (gdk_window_get_gl_window (window));
 end;
 

+ 2 - 2
packages/gtk2/src/gtkglext/gtkglext.pas

@@ -37,9 +37,9 @@ uses Glib2, Gdk2, Gtk2, GdkGLExt;
 {$ENDIF FPC_DOTTEDUNITS}
 
 const
-  GtkGLExtLib = 
+  GtkGLExtLib =
     {$ifdef WINDOWS} 'libgtkglext-win32-1.0-0.dll'
-    {$else}        
+    {$else}
       {$ifdef DARWIN}
         'gtkglext-x11-1.0'
         {$linklib gtkglext-x11-1.0}

+ 1 - 1
packages/gtk2/src/gtkglext/gtkglwidget.inc

@@ -37,7 +37,7 @@ function gtk_widget_get_gl_drawable(widget: PGtkWidget): PGdkGLDrawable;
 
 function gtk_widget_get_gl_drawable(widget: PGtkWidget): PGdkGLDrawable;
 begin
- gtk_widget_get_gl_drawable := 
+ gtk_widget_get_gl_drawable :=
    GDK_GL_DRAWABLE (gtk_widget_get_gl_window (widget));
 end;
 

+ 1 - 1
packages/gtk2/src/pango/pango-glyph-item.inc

@@ -30,7 +30,7 @@ end;
 {$IFDEF read_interface_functions}
 
 function PANGO_TYPE_GLYPH_ITEM : GType;
-  
+
 function pango_glyph_item_get_type():GType;cdecl;external pangolib;
 function pango_glyph_item_split(orig:PPangoGlyphItem; text:PAnsiChar; split_index:longint):PPangoGlyphItem;cdecl;external pangolib;
 function pango_glyph_item_copy(orig:PPangoGlyphItem):PPangoGlyphItem;cdecl;external pangolib;

+ 1 - 1
packages/gtk2/src/pango/pango-layout.inc

@@ -11,7 +11,7 @@
    TPangoWrapMode = (
      PANGO_WRAP_WORD,
      PANGO_WRAP_CHAR,
-     PANGO_WRAP_WORD_CHAR 
+     PANGO_WRAP_WORD_CHAR
    );
 
    PPangoEllipsizeMode = ^TPangoEllipsizeMode;

+ 4 - 4
packages/gtk2/src/pango/pango-renderer.inc

@@ -32,11 +32,11 @@ type
      TPangoRendererClass = record
           parent_class : TGObjectClass;
           draw_glyphs : procedure (renderer:PPangoRenderer; font:PPangoFont; glyphs:PPangoGlyphString; x:longint; y:longint);cdecl;
-          draw_rectangle : procedure (renderer:PPangoRenderer; part:TPangoRenderPart; x:longint; y:longint; width:longint; 
+          draw_rectangle : procedure (renderer:PPangoRenderer; part:TPangoRenderPart; x:longint; y:longint; width:longint;
                         height:longint); cdecl;
           draw_error_underline : procedure (renderer:PPangoRenderer; x:longint; y:longint; width:longint; height:longint); cdecl;
           draw_shape : procedure (renderer:PPangoRenderer; attr:PPangoAttrShape; x:longint; y:longint); cdecl;
-          draw_trapezoid : procedure (renderer:PPangoRenderer; part:TPangoRenderPart; y1_:double; x11:double; x21:double; 
+          draw_trapezoid : procedure (renderer:PPangoRenderer; part:TPangoRenderPart; y1_:double; x11:double; x21:double;
                         y2:double; x12:double; x22:double); cdecl;
           draw_glyph : procedure (renderer:PPangoRenderer; font:PPangoFont; glyph:TPangoGlyph; x:double; y:double); cdecl;
           part_changed : procedure (renderer:PPangoRenderer; part:TPangoRenderPart); cdecl;
@@ -73,10 +73,10 @@ function pango_renderer_get_type: GType; cdecl; external pangolib;
 procedure pango_renderer_draw_layout(renderer:PPangoRenderer; layout:PPangoLayout; x:longint; y:longint);cdecl; external pangolib;
 procedure pango_renderer_draw_layout_line(renderer:PPangoRenderer; line:PPangoLayoutLine; x:longint; y:longint);cdecl; external pangolib;
 procedure pango_renderer_draw_glyphs(renderer:PPangoRenderer; font:PPangoFont; glyphs:PPangoGlyphString; x:longint; y:longint);cdecl; external pangolib;
-procedure pango_renderer_draw_rectangle(renderer:PPangoRenderer; part:TPangoRenderPart; x:longint; y:longint; width:longint; 
+procedure pango_renderer_draw_rectangle(renderer:PPangoRenderer; part:TPangoRenderPart; x:longint; y:longint; width:longint;
             height:longint);cdecl; external pangolib;
 procedure pango_renderer_draw_error_underline(renderer:PPangoRenderer; x:longint; y:longint; width:longint; height:longint);cdecl; external pangolib;
-procedure pango_renderer_draw_trapezoid(renderer:PPangoRenderer; part:TPangoRenderPart; y1_:double; x11:double; x21:double; 
+procedure pango_renderer_draw_trapezoid(renderer:PPangoRenderer; part:TPangoRenderPart; y1_:double; x11:double; x21:double;
             y2:double; x12:double; x22:double);cdecl; external pangolib;
 procedure pango_renderer_draw_glyph(renderer:PPangoRenderer; font:PPangoFont; glyph:TPangoGlyph; x:double; y:double);cdecl; external pangolib;
 procedure pango_renderer_activate(renderer:PPangoRenderer);cdecl; external pangolib;

+ 11 - 11
packages/gtk2/src/pangocairo/pangocairo.pas

@@ -1,19 +1,19 @@
 {
     Pango
     pangocairo.h:
-    
+
     Copyright (C) 1999, 2004 Red Hat, Inc.
-    
+
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
-    
+
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
     Library General Public License for more details.
-    
+
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -66,21 +66,21 @@ const
 { $define HasPango1_22}
 
 Type
-  PPangoCairoFont = pointer;   
+  PPangoCairoFont = pointer;
   PPangoCairoFontMap = pointer;
   PangoCairoShapeRendererFunc = procedure (cr:Pcairo_t; attr:PPangoAttrShape; do_path:gboolean; data:gpointer);cdecl;
-    
+
 {$IFDEF FPC}
 {$PACKRECORDS C}
 {$ENDIF}
 
 function PANGO_TYPE_CAIRO_FONT : GType;
-function PANGO_CAIRO_FONT(objekt : pointer) : PPangoCairoFont;    
-function PANGO_IS_CAIRO_FONT(objekt : pointer) : boolean;    
+function PANGO_CAIRO_FONT(objekt : pointer) : PPangoCairoFont;
+function PANGO_IS_CAIRO_FONT(objekt : pointer) : boolean;
 
 function PANGO_TYPE_CAIRO_FONT_MAP : GType;
-function PANGO_CAIRO_FONT_MAP(objekt : pointer) : PPangoCairoFontMap;    
-function PANGO_IS_CAIRO_FONT_MAP(objekt : pointer) : boolean;    
+function PANGO_CAIRO_FONT_MAP(objekt : pointer) : PPangoCairoFontMap;
+function PANGO_IS_CAIRO_FONT_MAP(objekt : pointer) : boolean;
 
 function pango_cairo_font_map_get_type():GType;cdecl;external pangocairolib;
 function pango_cairo_font_map_new:PPangoFontMap;cdecl;external pangocairolib;
@@ -93,7 +93,7 @@ function pango_cairo_font_map_get_resolution(fontmap:PPangoCairoFontMap):double;
 {$ifndef PANGO_DISABLE_DEPRECATED}
 function pango_cairo_font_map_create_context(fontmap:PPangoCairoFontMap):PPangoContext;cdecl;external pangocairolib;
 {$endif}
-    
+
 function pango_cairo_font_get_type():GType;cdecl;external pangocairolib;
 function pango_cairo_font_get_scaled_font(font:PPangoCairoFont):Pcairo_scaled_font_t;cdecl;external pangocairolib;
 procedure pango_cairo_update_context(cr:Pcairo_t; context:PPangoContext);cdecl;external pangocairolib;

+ 1 - 1
packages/hash/fpmake.pp

@@ -44,7 +44,7 @@ begin
     T:=P.Targets.AddUnit('src/hmac.pp');
     T:=P.Targets.AddUnit('src/fnvhash.pp');
     T:=P.Targets.AddUnit('src/unixcrypt.pas');
-    
+
     T.OSes:=[Linux];
     T:=P.Targets.AddExampleunit('examples/mdtest.pas');
     T:=P.Targets.AddExampleunit('examples/hmd5.pp');

+ 1 - 1
packages/hash/src/fnvhash.pp

@@ -20,7 +20,7 @@ unit fnvhash;
 
 interface
 
-uses 
+uses
 {$IFDEF FPC_DOTTEDUNITS}
   System.SysUtils, System.Types;
 {$ELSE}

+ 1 - 1
packages/hash/src/md5i386.inc

@@ -1415,7 +1415,7 @@ asm
   ADD ECX, EAX
   ROL ECX, 21
   ADD ECX, ESI
-  
+
   POP EAX // EAX = Context
 
   ADD TMDContext.State[EAX + 4*0], EBX //  Context.State[0 .. 3] += A, B, C, D

+ 2 - 2
packages/hash/tests/tsha1test.pp

@@ -3,7 +3,7 @@ program sha1test;
 {$mode objfpc}
 {$h+}
 
-uses 
+uses
   {$ifdef unix}
   cwstring,
   {$endif}
@@ -52,5 +52,5 @@ begin
   begin
     writeln('SHA-1 tests failed: ', code);
   end;
-  Halt(code);	
+  Halt(code);
 end.

+ 1 - 1
packages/hermes/src/hermes.pp

@@ -60,7 +60,7 @@ interface
 {$IF  defined(cpui386) and defined(FPC_PIC)}
   { FPC_PIC is only set after parsing _INTERFFACE keyword
     so we need to delay the test to here }
-  { the i386 assembler code is not prepared for PIC code }    
+  { the i386 assembler code is not prepared for PIC code }
   {$DEFINE noassembler}
   { Thus, disable assembler code in that case for now }
   {$UNDEF I386_ASSEMBLER}

+ 4 - 4
packages/httpd13/src/ap.inc

@@ -101,9 +101,9 @@ type
     curpos: PAnsiChar;
     endpos: PAnsiChar;
   end;
-  
+
   Pap_vformatter_buff = ^ap_vformatter_buff;
-  
+
   flush_func_t = function (param: Pap_vformatter_buff): cint;
 
 function ap_vformatter(flush_func: flush_func_t;
@@ -136,13 +136,13 @@ function ap_vsnprintf(buf: PAnsiChar; len: size_t; const format: PAnsiChar; ap:
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} external LibHTTPD;
 
 { Simple BASE64 encode/decode functions.
- * 
+ *
  * As we might encode binary strings, hence we require the length of
  * the incoming plain source. And return the length of what we decoded.
  *
  * The decoding function takes any non valid AnsiChar (i.e. whitespace, \0
  * or anything non A-Z,0-9 etc as terminal.
- * 
+ *
  * plain strings/binary sequences are not assumed '\0' terminated. Encoded
  * strings are neither. But propably should.
  *

+ 5 - 5
packages/httpd13/src/ap_alloc.inc

@@ -31,8 +31,8 @@
  }
 
 { Arenas for configuration info and transaction info
- * --- actual layout of the pool structure is private to 
- * alloc.c.  
+ * --- actual layout of the pool structure is private to
+ * alloc.c.
  }
 
  { Need declaration of DIR on Win32 }
@@ -186,7 +186,7 @@ function ap_array_pstrcat(p: PPool; const arr: Parray_header; const sep: AnsiCha
 
 type
   table = record end;
-  
+
   Ptable = ^table;
 
   table_entry = record
@@ -279,7 +279,7 @@ procedure ap_overlap_tables(a: Ptable; const b: Ptable; flags: cuint);
  * to keep CGI scripts and the like from inheriting access to things
  * they shouldn't be able to touch, and one for actually cleaning up,
  * when the actual server process wants to get rid of the thing,
- * whatever it is.  
+ * whatever it is.
  *
  * kill_cleanup disarms a cleanup, presumably because the resource in
  * question has been closed, freed, or whatever, and it's scarce
@@ -331,7 +331,7 @@ procedure ap_unblock_alarms;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} external LibHTTPD;
 
 { Common cases which want utility support..
- * the note_cleanups_for_foo routines are for 
+ * the note_cleanups_for_foo routines are for
  }
 
 {API_EXPORT(FILE *) ap_pfopen(struct pool *, const AnsiChar *name, const AnsiChar *fmode);

+ 6 - 6
packages/httpd13/src/ap_config.inc

@@ -74,7 +74,7 @@ type rlim_t = cint;
 {$define HAVE_FLOCK_SERIALIZED_ACCEPT}
 {$define _BSD_SOURCE}
 #define EAGAIN EWOULDBLOCK
-int initgroups (AnsiChar *, int);     
+int initgroups (AnsiChar *, int);
 AnsiChar *crypt (const AnsiChar *pw, const AnsiChar *salt);
 int gethostname (AnsiChar *name, int namelen);
 
@@ -245,7 +245,7 @@ typedef int rlim_t;
 #endif
 #define USE_FCNTL_SERIALIZED_ACCEPT
 #if AIX >= 432
-#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT 
+#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
 #endif
 #ifdef USEBCOPY
 #define memmove(a,b,c) bcopy(b,a,c)
@@ -686,7 +686,7 @@ extern AnsiChar *crypt();
 #define strftime(buf,bufsize,fmt,tm)    ascftime(buf,fmt,tm)
 #undef HAVE_SYS_RESOURCE_H { exists but does not provide *rlimit funcs }
 #include <sys/types.h>
-#include <sys/time.h>     
+#include <sys/time.h>
 
 {$else}{$if defined(APOLLO)}
 #undef HAVE_GMTOFF
@@ -1086,8 +1086,8 @@ const
 
 {
  * The particular directory style your system supports. If you have dirent.h
- * in /usr/include (POSIX) or /usr/include/sys (SYSV), #include 
- * that file and define DIR_TYPE to be dirent. Otherwise, if you have 
+ * in /usr/include (POSIX) or /usr/include/sys (SYSV), #include
+ * that file and define DIR_TYPE to be dirent. Otherwise, if you have
  * /usr/include/sys/dir.h, define DIR_TYPE to be direct and include that
  * file. If you have neither, I'm confused.
  }
@@ -1423,7 +1423,7 @@ type NET_SIZE_T = cint;
 { Prototypes needed to get a clean compile with gcc -Wall.
  * Believe it or not, these do have to be declared, at least on SunOS,
  * because they aren't mentioned in the relevant system headers.
- * Sun Quality Software.  Gotta love it.  This section is not 
+ * Sun Quality Software.  Gotta love it.  This section is not
  * currently (13Nov97) used.
  }
 

+ 3 - 3
packages/httpd13/src/ap_mmn.inc

@@ -127,8 +127,8 @@
  * 19980816 (1.3.2-dev)	- change proxy to use tables for headers, change
  *                        struct cache_req to typedef cache_req.
  *                        Delete ap_proxy_get_header(), ap_proxy_add_header(),
- *                        ap_proxy_del_header(). Change interface of 
- *                        ap_proxy_send_fb() and ap_proxy_cache_error(). 
+ *                        ap_proxy_del_header(). Change interface of
+ *                        ap_proxy_send_fb() and ap_proxy_cache_error().
  *                        Add ap_proxy_send_hdr_line() and ap_proxy_bputs2().
  * 19980825 (1.3.2-dev) - renamed is_HTTP_xxx() macros to ap_is_HTTP_xxx()
  * 19980825.1           - mod_proxy only (minor change): modified interface of
@@ -171,7 +171,7 @@
  * 19990108.7           - ap_isxdigit added
  * 19990320             - METHODS and M_INVALID symbol values modified
  * 19990320.1           - add ap_vrprintf()
- * 19990320.2           - add cmd_parms.context, ap_set_config_vectors, 
+ * 19990320.2           - add cmd_parms.context, ap_set_config_vectors,
  *                        export ap_add_file_conf
  * 19990320.3           - add ap_regexec() and ap_regerror()
  * 19990320.4           - add ap_field_noparam()

+ 5 - 5
packages/httpd13/src/buff.inc

@@ -57,7 +57,7 @@ type
   PPBUFF = ^PBUFF;
 
   error_t = procedure (fb: PBUFF; op: cint; data: Pointer);
-  
+
   filter_callback_t = procedure (param1: PBUFF; const param2: Pointer; param3: cint);
 
   buff_struct = record
@@ -93,7 +93,7 @@ type
 
     callback_data: Pointer;
     filter_callback: filter_callback_t;
-	
+
   end;
 
 {$ifdef B_SFIO}
@@ -187,7 +187,7 @@ type
   child_info = record
 {$ifdef WINDOWS}
     {
-     *  These handles are used by ap_call_exec to call 
+     *  These handles are used by ap_call_exec to call
      *  create process with pipe handles.
      }
     hPipeInputRead: HANDLE;
@@ -204,9 +204,9 @@ type
     dummy: cint;
 {$endif}
   end;
-  
+
   Pchild_info = ^child_info;
-  
+
   func_t = function (param1: Pointer; param2: Pchild_info): cint;
 
 function ap_bspawn_child(p: PPool;

+ 2 - 2
packages/httpd13/src/hsregex.inc

@@ -26,9 +26,9 @@ type
 {$endif}
 
   Pregex_t = ^regex_t;
-  
+
   Pre_guts = Pointer;
-  
+
   regex_t = record
     re_magic: cint;
     re_nsub: size_t;		{ number of parenthesized subexpressions }

+ 4 - 4
packages/httpd13/src/http_config.inc

@@ -46,7 +46,7 @@ type
   );
 
   cs_func_t = function (): PAnsiChar;
-  
+
   command_struct = record
     name: PAnsiChar;		{ Name of this command }
     func: cs_func_t;       	{ Function invoked }
@@ -140,7 +140,7 @@ type
   handler_t = function (param1: Prequest_rec): Integer; cdecl;
 
   Phandler_rec = ^handler_rec;
-  
+
   handler_rec = record
     content_type: PAnsiChar;	{ MUST be all lower case }
     handler: handler_t;
@@ -153,7 +153,7 @@ type
  }
 
   Pmodule_struct = ^module_struct;
-  
+
 {$ifdef ULTRIX_BRAIN_DEATH}
     init_t = procedure (); cdecl;
     create_dir_config_t = function (): Pointer; cdecl;
@@ -257,7 +257,7 @@ type
 
     post_read_request: hook_t;
   end;
-  
+
   module = module_struct;
 
   Pmodule = ^module;

+ 19 - 19
packages/httpd13/src/http_core.inc

@@ -89,7 +89,7 @@ function ap_document_root(r: Prequest_rec): PAnsiChar;
 				      * that, it'll screw you.  But it's
 				      * back-compatible...
                                       }
-                                      
+
 function ap_get_remote_host(conn: Pconn_rec; dir_config: Pointer; type_: cint): PAnsiChar;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} external LibHTTPD;
 
@@ -130,15 +130,15 @@ function ap_is_recursion_limit_exceeded(const r: Prequest_rec): cint;
  * to maintain common state for all of them in the core, and make it
  * available to the other modules through interfaces.
  }
-    
+
 type
   require_line = record
     method_mask: cint;
     requirement: PAnsiChar;
   end;
-     
+
 {API_EXPORT(const AnsiChar *) ap_auth_type (request_rec *);
-API_EXPORT(const AnsiChar *) ap_auth_name (request_rec *);     
+API_EXPORT(const AnsiChar *) ap_auth_name (request_rec *);
 API_EXPORT(const AnsiChar *) ap_auth_nonce (request_rec *);
 API_EXPORT(int) ap_satisfies (request_rec *r);
 API_EXPORT(const array_header *) ap_requires (request_rec *);    }
@@ -191,9 +191,9 @@ const
   ETAG_SIZE  = (1 shl 3);
   ETAG_BACKWARD = (ETAG_MTIME or ETAG_INODE or ETAG_SIZE);
   ETAG_ALL   = (ETAG_MTIME or ETAG_INODE or ETAG_SIZE);
-  
+
   { Things moved up }
-  
+
   HOSTNAME_LOOKUP_OFF	= 0;
   HOSTNAME_LOOKUP_ON	= 1;
   HOSTNAME_LOOKUP_DOUBLE= 2;
@@ -231,7 +231,7 @@ type
     AP_FLAG_ON = 1,
     AP_FLAG_OFF = 2
   );
-  
+
   server_signature_t = ( srv_sig_unset, srv_sig_off, srv_sig_on,
    srv_sig_withmail);
 
@@ -253,16 +253,16 @@ type
     opts_add: allow_options_t;
     opts_remove: allow_options_t;
     override_: overrides_t;
-    
+
     { MIME typing --- the core doesn't do anything at all with this,
      * but it does know what to slap on a request for a document which
      * goes untyped by other mechanisms before it slips out the door...
      }
-    
+
     ap_default_type: PAnsiChar;
-  
+
     { Authentication stuff.  Groan... }
-    
+
     satisfy: cint;
     ap_auth_type: PAnsiChar;
     ap_auth_name: PAnsiChar;
@@ -273,13 +273,13 @@ type
      * if it's not null then it's allocated to sizeof(AnsiChar*)*RESPONSE_CODES.
      * This lets us do quick merges in merge_core_dir_configs().
      }
-  
+
     response_code_strings: PPAnsiChar; { from ErrorDocument, not from
                                    * ap_custom_response()
                                    }
 
     { Hostname resolution etc }
-    
+
     { Moved Up }
 
 //    unsigned int hostname_lookups : 4;
@@ -301,7 +301,7 @@ type
     { should we force a charset on any outgoing parameterless content-type?
      * if so, which charset?
      }
-     
+
     { Moved up }
 
 //    unsigned add_default_charset : 2;
@@ -322,7 +322,7 @@ type
     { logging options }
     server_signature: server_signature_t;
     loglevel: cint;
-    
+
     { Access control }
     sec: Parray_header;
     r: Pregex_t;
@@ -331,7 +331,7 @@ type
     { Where to find interpreter to run scripts }
     script_interpreter_source: interpreter_source_e;
 {$endif}
-    
+
 {$ifdef CHARSET_EBCDIC}
 
     { Moved up }
@@ -345,7 +345,7 @@ type
     ebcdicconversion_by_type_out: Ptable;
 
     { Moved up }
-    
+
     x_ascii_magic_kludge: cint;   { whether to handle the text/x-ascii- kludge }
 
 {$ifdef ADD_EBCDICCONVERT_DEBUG_HEADER}
@@ -375,7 +375,7 @@ type
 
 type
   core_server_config = record
-  
+
 {$ifdef GPROF}
     gprof_dir: PAnsiChar;
 {$endif}
@@ -385,7 +385,7 @@ type
      * can be tested that way).  But let's keep it to the bare minimum:
      }
     ap_document_root: PAnsiChar;
-  
+
     { Access control }
 
     access_name: PAnsiChar;

+ 1 - 1
packages/httpd13/src/http_log.inc

@@ -107,7 +107,7 @@ type
 //    FILE *write_f;
 //#endif
   end;
-  
+
   Ppiped_log = ^piped_log;
 
 procedure ap_open_piped_log(p: PPool; const program_: PAnsiChar);

+ 2 - 2
packages/httpd13/src/http_main.inc

@@ -53,7 +53,7 @@
  * in use are known to deal well with EINTR it could cause corruption as well.
  * But things are likely to do much better with a soft_timeout in scope than a
  * hard_timeout.
- * 
+ *
  * A module MAY NOT use a hard_timeout() across * sub_req_lookup_xxx()
  * functions, or across run_sub_request() functions.  A module SHOULD NOT use a
  * soft_timeout() in either of these cases, but sometimes there's just no
@@ -129,7 +129,7 @@ AnsiChar *ap_init_mutex_method(AnsiChar *t);}
  }
 type
   maintenance_t = procedure (reason: cint; data: Pointer; status: ap_wait_t);
-  
+
 procedure ap_register_other_child(pid: cint;
  maintenance: maintenance_t; data: Pointer; write_fd: cint);
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} external LibHTTPD;

+ 28 - 28
packages/httpd13/src/httpd.inc

@@ -73,8 +73,8 @@ const
 {
  * --------- You shouldn't have to edit anything below this line ----------
  *
- * Any modifications to any defaults not defined above should be done in the 
- * respective config. file. 
+ * Any modifications to any defaults not defined above should be done in the
+ * respective config. file.
  *
  }
 
@@ -257,7 +257,7 @@ const
  *     A fatal error, resulting in the whole server aborting.
  *     If a child exits with this error, the parent process
  *     considers this a server-wide fatal error and aborts.
- *                 
+ *
  }
   APEXIT_OK	      =	$0;
   APEXIT_INIT	      =	$2;
@@ -293,8 +293,8 @@ const
  * by listen(2).  Under some systems, it should be increased if you
  * are experiencing a heavy TCP SYN flood attack.
  *
- * It defaults to 511 instead of 512 because some systems store it 
- * as an 8-bit datatype; 512 truncated to 8-bits is 0, while 511 is 
+ * It defaults to 511 instead of 512 because some systems store it
+ * as an 8-bit datatype; 512 truncated to 8-bits is 0, while 511 is
  * 255 when truncated.
  }
 
@@ -327,7 +327,7 @@ const
   DEFAULT_LIMIT_REQUEST_FIELDS = 100;
 
 {
- * The default default character set name to add if AddDefaultCharset is 
+ * The default default character set name to add if AddDefaultCharset is
  * enabled.  Overridden with AddDefaultCharsetName.
  }
   DEFAULT_ADD_DEFAULT_CHARSET_NAME = 'iso-8859-1';
@@ -339,10 +339,10 @@ const
  * The tokens are listed in order of their significance for identifying the
  * application.
  *
- * "Product tokens should be short and to the point -- use of them for 
+ * "Product tokens should be short and to the point -- use of them for
  * advertizing or other non-essential information is explicitly forbidden."
  *
- * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
+ * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
  }
 
   SERVER_BASEVENDOR   = 'Apache Group';
@@ -558,9 +558,9 @@ const
   REQUEST_CHUNKED_ERROR   = 1;
   REQUEST_CHUNKED_DECHUNK = 2;
   REQUEST_CHUNKED_PASS    = 3;
-  
+
   { Things moved up }
-  
+
   DEFAULT_VHOST_ADDR = $ffffffff;
 
 { Things which may vary per file-lookup WITHIN a request ---
@@ -581,7 +581,7 @@ const
  }
 type
   Phtaccess_result = ^htaccess_result;
-  
+
   htaccess_result = record
     dir: PAnsiChar;			{ the directory to which this applies }
     override_: cint;		{ the overrides allowed for the .htaccess file }
@@ -748,12 +748,12 @@ type
     htaccess: Phtaccess_result;
 
     { On systems with case insensitive file systems (Windows, OS/2, etc.),
-     * r->filename is case canonicalized (folded to either lower or upper 
+     * r->filename is case canonicalized (folded to either lower or upper
      * case, depending on the specific system) to accomodate file access
-     * checking. case_preserved_filename is the same as r->filename 
-     * except case is preserved. There is at least one instance where Apache 
-     * needs access to the case preserved filename: Java class files published 
-     * with WebDAV need to preserve filename case to make the Java compiler 
+     * checking. case_preserved_filename is the same as r->filename
+     * except case is preserved. There is at least one instance where Apache
+     * needs access to the case preserved filename: Java class files published
+     * with WebDAV need to preserve filename case to make the Java compiler
      * happy.
      }
     case_preserved_filename: PAnsiChar;
@@ -781,7 +781,7 @@ type
  }
 
   sockaddr_in = record end;
- 
+
   conn_rec = record
 
     pool: Pap_pool;
@@ -835,7 +835,7 @@ type
   { Moved up }
 
   Pserver_addr_rec = ^server_addr_rec;
-  
+
   in_addr = record end;
 
   server_addr_rec = record
@@ -913,9 +913,9 @@ type
   end;
 
   tm = record end;
-  
+
   Ptm = ^tm;
-  
+
 { Prototypes for utilities... util.c.
  }
 
@@ -1029,7 +1029,7 @@ API_EXPORT(int) ap_strcasecmp_match(const AnsiChar *str, const AnsiChar *exp);
 API_EXPORT(AnsiChar *) ap_stripprefix(const AnsiChar *bigstring, const AnsiChar *prefix);
 API_EXPORT(AnsiChar *) ap_strcasestr(const AnsiChar *s1, const AnsiChar *s2);
 API_EXPORT(AnsiChar *) ap_pbase64decode(pool *p, const AnsiChar *bufcoded);
-API_EXPORT(AnsiChar *) ap_pbase64encode(pool *p, AnsiChar *string); 
+API_EXPORT(AnsiChar *) ap_pbase64encode(pool *p, AnsiChar *string);
 API_EXPORT(AnsiChar *) ap_uudecode(pool *p, const AnsiChar *bufcoded);
 API_EXPORT(AnsiChar *) ap_uuencode(pool *p, AnsiChar *string); }
 
@@ -1044,7 +1044,7 @@ void os2pathname(AnsiChar *path);
 
 {API_EXPORT(int)    ap_regexec(const regex_t *preg, const AnsiChar *string,
                               size_t nmatch, regmatch_t pmatch[], int eflags);
-API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg, 
+API_EXPORT(size_t) ap_regerror(int errcode, const regex_t *preg,
                                AnsiChar *errbuf, size_t errbuf_size);
 API_EXPORT(AnsiChar *) ap_pregsub(pool *p, const AnsiChar *input, const AnsiChar *source,
                               size_t nmatch, regmatch_t pmatch[]);
@@ -1061,13 +1061,13 @@ API_EXPORT(void) ap_remove_spaces(AnsiChar *dest, AnsiChar *src);}
 type
 
   Pconfigfile_t = ^configfile_t;
-  
+
   getch_t = function (param: Pointer): cint;
-  
+
   getstr_t = function (buf: Pointer; bufsiz: size_t; param: Pointer): Pointer;
-  
+
   close_t = function (param: Pointer): cint;
-  
+
   configfile_t = record
     getch: getch_t;	{ a getc()-like function }
     getstr: getstr_t;   { a fgets()-like function }
@@ -1248,7 +1248,7 @@ type
     sig: cint;
     pid: pid_t;
   end;
-  
+
   Pap_exception_info_t = ^ap_exception_info_t;
 
 { Register a function to be called after a fatal exception (on *X systems, a
@@ -1259,7 +1259,7 @@ type
  * report failure and no such hooks will be called.
  }
  fn_afeh_t = procedure (param: Pap_exception_info_t);
- 
+
 function ap_add_fatal_exception_hook(fn: fn_afeh_t): cint;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} external LibHTTPD;
 

+ 2 - 2
packages/httpd13/src/readdir.inc

@@ -34,7 +34,7 @@
 
 const
   _MAX_FNAME = 256;
-  
+
 type
   dirent = record
     d_ino: clong;                         { inode (always 1 in WIN32) }
@@ -55,7 +55,7 @@ type
   end;
 
   PDIR = ^DIR;
-  
+
 { Function prototypes }
 {API_EXPORT(DIR *) opendir(const AnsiChar *);
 API_EXPORT(struct dirent *) readdir(DIR *);

+ 1 - 1
packages/httpd13/src/util_uri.inc

@@ -62,7 +62,7 @@ type
     hostent: Phostent;
 
     port: cushort;	{ The port number, numeric, valid only if port_str != NULL }
-    
+
 //    unsigned is_initialized:1;
 
 //    unsigned dns_looked_up:1;

+ 1 - 1
packages/httpd20/examples/define.inc

@@ -1,6 +1,6 @@
 { **********************************************************************
   Define one of the following versions. Default 2.0 will be taken if none
-  is defined  
+  is defined
   **********************************************************************}
 
 { $define apache1_3}

+ 17 - 17
packages/httpd20/examples/minimain.pas

@@ -1,20 +1,20 @@
-unit minimain; 
- 
-interface 
+unit minimain;
+
+interface
 
 {$mode delphi}{$H+}
- 
-uses 
+
+uses
   SysUtils, Classes, httpd, apr;
 
-procedure RegisterHooks(p: Papr_pool_t); cdecl; 
- 
-implementation 
- 
+procedure RegisterHooks(p: Papr_pool_t); cdecl;
+
+implementation
+
 function DefaultHandler(r: Prequest_rec): Integer; cdecl;
 var
   RequestedHandler: ;
-begin 
+begin
   RequestedHandler := r^.handler;
 
   { We decline to handle a request if hello-handler is not the value of r->handler }
@@ -57,10 +57,10 @@ begin
          * OK, then no other modules will attempt to process this request }
   Result := OK;
 end;
- 
-procedure RegisterHooks(p: Papr_pool_t); cdecl; 
-begin 
-  ap_hook_handler(DefaultHandler,nil,nil,APR_HOOK_MIDDLE); 
-end; 
- 
-end. 
+
+procedure RegisterHooks(p: Papr_pool_t); cdecl;
+begin
+  ap_hook_handler(DefaultHandler,nil,nil,APR_HOOK_MIDDLE);
+end;
+
+end.

+ 18 - 18
packages/httpd20/examples/mod_example.pp

@@ -415,7 +415,7 @@ begin
                         nil]);
 
     if (trace_copy = nil) then sofar := '' else sofar := trace_copy;
-    
+
     trace_copy := apr_pstrcat(p, [sofar, addon, nil]);
     if (r <> nil) then apr_table_set(r^.notes, TRACE_NOTE, trace_copy)
     else trace := trace_copy;
@@ -809,7 +809,7 @@ begin
     if s1conf^.cmode = s2conf^.cmode then
      merged_config^.cmode := s1conf^.cmode
     else merged_config^.cmode := CONFIG_MODE_COMBO;
-    
+
     merged_config^.local := s2conf^.local;
     merged_config^.congenital := (s1conf^.congenital or s1conf^.local);
     merged_config^.loc := apr_pstrdup(p, s2conf^.loc);
@@ -985,11 +985,11 @@ var
   cfg: Px_cfg;
 begin
   cfg := our_dconfig(r);
-  
+
   { Log the call and exit. }
-  
+
   trace_add(r^.server, nil, cfg, 'x_post_config()');
-    
+
   Result := DECLINED;
 end;
 
@@ -1073,7 +1073,7 @@ begin
    * called.
    }
   trace_add(r^.server, r, cfg, 'x_translate_handler()');
-    
+
   Result := DECLINED;
 end;
 
@@ -1099,7 +1099,7 @@ begin
    * called.
    }
   trace_add(r^.server, r, cfg, 'header_parser_handler()');
-  
+
   Result := DECLINED;
 end;
 
@@ -1120,7 +1120,7 @@ begin
   cfg := our_dconfig(r);
 
   { Don't do anything except log the call. }
-  
+
   trace_add(r^.server, r, cfg, 'x_check_user_id()');
 
   Result := DECLINED;
@@ -1141,12 +1141,12 @@ var
   cfg: Px_cfg;
 begin
   cfg := our_dconfig(r);
-    
+
   { * Log the call and return OK, or access will be denied (even though we
     * didn't actually do anything). }
-      
+
   trace_add(r^.server, r, cfg, 'x_auth_checker()');
-  
+
   Result := DECLINED;
 end;
 
@@ -1165,7 +1165,7 @@ var
 begin
   cfg := our_dconfig(r);
   trace_add(r^.server, r, cfg, 'x_access_checker()');
-    
+
   Result := DECLINED;
 end;
 
@@ -1185,9 +1185,9 @@ begin
 
   {  * Log the call, but don't do anything else - and report truthfully that
      * we didn't do anything. }
-     
+
   trace_add(r^.server, r, cfg, 'x_type_checker()');
-    
+
   Result := DECLINED;
 end;
 
@@ -1208,7 +1208,7 @@ begin
   { Log the call and exit. }
 
   trace_add(r^.server, r, cfg, 'x_fixer_upper()');
-    
+
   Result := OK;
 end;
 
@@ -1313,11 +1313,11 @@ var
 begin
   default_module_ptr := @example_module;
   FillChar(default_module_ptr^, SizeOf(default_module_ptr^), 0);
-  
+
   STANDARD20_MODULE_STUFF(default_module_ptr^);
-  
+
   { List of directives specific to our module. }
-  
+
   with x_cmds do
   begin
     name := 'Example';

+ 3 - 3
packages/httpd20/examples/mod_hello.pp

@@ -25,7 +25,7 @@ var
 
 const
   MODULE_NAME = 'mod_hello.so';
-  
+
 {*******************************************************************
 *  Free Pascal only supports exporting variables on Windows
 *******************************************************************}
@@ -40,7 +40,7 @@ exports
 function DefaultHandler(r: Prequest_rec): Integer; cdecl;
 var
   RequestedHandler: ;
-  
+
 begin
   RequestedHandler := r^.handler;
 
@@ -63,7 +63,7 @@ begin
   {$else}
     ap_set_content_type(r, 'text/html');
   {$endif}
-  
+
   { If the request is for a header only, and not a request for
    the whole content, then return OK now. We don't have to do
    anything else. }

+ 18 - 18
packages/httpd20/examples/mod_spelling.pp

@@ -78,7 +78,7 @@ type
   spconfig = record
     enabled: Integer;
   end;
-  
+
   Pspconfig = ^spconfig;
 
 {
@@ -163,7 +163,7 @@ type
     name: PAnsiChar;
     quality: sp_reason;
   end;
-  
+
   Pmisspelled_file = ^misspelled_file;
 
 {
@@ -186,9 +186,9 @@ type
  }
 {
   Extra notes about how this function works:
-  
+
   * s and t are supposed different
-  
+
   * s
 }
 function spdist(const cs, ct: PAnsiChar): sp_reason;
@@ -218,31 +218,31 @@ begin
       Inc(i);
       j := t;
       Inc(j);
-    
+
       if Integer(i^) and Integer(j^) <> 0 then
        if (apr_tolower(s^) = apr_tolower(j^)) and (apr_tolower(t^) = apr_tolower(i^)) then
        begin
          Inc(i);
          Inc(j);
-        
+
          if stricomp(i, j) = 0 then
          begin
            Result := SP_TRANSPOSITION;        { transposition }
            Exit;
          end;
        end;
-      
+
       Dec(i);
       Dec(j);
-      
+
       if (stricomp(i, j) = 0) then
       begin
         Result := SP_SIMPLETYPO;   { 1 AnsiChar mismatch }
         Exit;
       end;
     end;
-    
-    
+
+
     if (stricomp(i, t) = 0) then
     begin
       Result := SP_EXTRACHAR;        { extra character }
@@ -401,7 +401,7 @@ begin
     else if (spdist(bad, dirent.name) <> SP_VERYDIFFERENT) then
     begin
       q := spdist(bad, dirent.name);
-        
+
       sp_new := Pmisspelled_file(apr_array_push(candidates));
       sp_new^.name := apr_pstrdup(r^.pool, dirent.name);
       sp_new^.quality := q;
@@ -452,7 +452,7 @@ begin
 {$endif}
     end;
   end;
-    
+
   apr_dir_close(dir);
 
   if (candidates^.nelts <> 0) then
@@ -463,7 +463,7 @@ begin
     ref := apr_table_get(r^.headers_in, 'Referer');
 
     List := TList.Create;
-    
+
     try
       for i := 0 to candidates^.nelts - 1 do
       begin
@@ -486,7 +486,7 @@ begin
      }
     nvariant_ := variant_;
     Inc(nvariant_, sizeof(misspelled_file));
-     
+
     if (variant_^.quality <> SP_VERYDIFFERENT) and ( (candidates^.nelts = 1)
      or (Integer(variant_^.quality) <> Integer(nvariant_^.quality))) then
     begin
@@ -531,7 +531,7 @@ begin
         Result := DECLINED;
         Exit;
       end;
-          
+
       t := apr_array_make(sub_pool, candidates^.nelts * 8 + 8, sizeof(PAnsiChar));
       v := apr_array_make(sub_pool, candidates^.nelts * 5, sizeof(PAnsiChar));
 
@@ -554,7 +554,7 @@ begin
                   '?', r^.parsed_uri.query, nil])
                 else vuri := apr_pstrcat(sub_pool, [url, variant_[i].name, r^.path_info,
 		 PAnsiChar(''), PAnsiChar(''), nil]);
-   
+
 		PPAnsiChar(apr_array_push(v))^ := '"';
 		PPAnsiChar(apr_array_push(v))^ := ap_escape_uri(sub_pool, vuri);
 		PPAnsiChar(apr_array_push(v))^ := '";"';
@@ -583,7 +583,7 @@ begin
 		  '</ul>' + LineEnding + 'Furthermore, the following related ' +
                   'documents were found:' + LineEnding + '<ul>' + LineEnding;
             end;
-            
+
 	    PPAnsiChar(apr_array_push(t))^ := '</ul>' + LineEnding;
 
             { If we know there was a referring page, add a note: }
@@ -628,7 +628,7 @@ begin
 
   {* Define the directives specific to this module.  This structure is referenced
    * later by the 'module' structure. }
-   
+
   with speling_cmds do
   begin
     name := 'CheckSpelling';

+ 4 - 4
packages/httpd20/fpmake.pp

@@ -110,12 +110,12 @@ begin
     P.ExamplePath.Add('examples');
     T:=P.Targets.AddExampleProgram('minimain.pas');
     T:=P.Targets.AddExampleProgram('mod_hello.pp');
-    T:=P.Targets.AddExampleProgram('mod_example.pp'); 
-    T.Dependencies.AddInclude('define.inc');	
+    T:=P.Targets.AddExampleProgram('mod_example.pp');
+    T.Dependencies.AddInclude('define.inc');
     T:=P.Targets.AddExampleProgram('mod_spelling.pp');
-    T.Dependencies.AddInclude('define.inc');	
+    T.Dependencies.AddInclude('define.inc');
     T:=P.Targets.AddExampleProgram('testmodule.pp');
-    T.Dependencies.AddInclude('define.inc');	
+    T.Dependencies.AddInclude('define.inc');
 
 
     P.NamespaceMap:='namespaces.lst';

+ 3 - 3
packages/httpd20/src/ap_mmn.inc

@@ -42,10 +42,10 @@
  * 20011127 (2.0.29-dev) bump for postconfig hook change, and removal of socket
  *                       from connection record
  * 20011212 (2.0.30-dev) bump for new used_path_info member of request_rec
- * 20011218 (2.0.30-dev) bump for new sbh member of conn_rec, different 
+ * 20011218 (2.0.30-dev) bump for new sbh member of conn_rec, different
  *                       declarations for scoreboard, new parameter to
  *                       create_connection hook
- * 20020102 (2.0.30-dev) bump for changed type of limit_req_body in 
+ * 20020102 (2.0.30-dev) bump for changed type of limit_req_body in
  *                       core_dir_config
  * 20020109 (2.0.31-dev) bump for changed shm and scoreboard declarations
  * 20020111 (2.0.31-dev) bump for ETag fields added at end of cor_dir_config
@@ -99,7 +99,7 @@ const
  * Useful for testing for features.
  * For example, suppose you wish to use the apr_table_overlap
  *    function.  You can do this:
- * 
+ *
  * #if AP_MODULE_MAGIC_AT_LEAST(19980812,2)
  *     ... use apr_table_overlap()
  * #else

+ 8 - 8
packages/httpd20/src/ap_mpm.inc

@@ -30,7 +30,7 @@
 
     The MPM may or may not be multithreaded.  In the event that it is
     multithreaded, at any instant it guarantees a 1:1 mapping of threads
-    ap_process_connection invocations.  
+    ap_process_connection invocations.
 
     Note: In the future it will be possible for ap_process_connection
     to return to the MPM prior to finishing the entire connection; and
@@ -68,7 +68,7 @@
 
 {
  * This is the function that MPMs must create.  This function is responsible
- * for controlling the parent and child processes.  It will run until a 
+ * for controlling the parent and child processes.  It will run until a
  * restart/shutdown is indicated.
  * @param pconf the configuration pool, reset before the config file is read
  * @param plog the log pool, reset after the config file is read
@@ -82,7 +82,7 @@ function ap_mpm_run(pconf, plog: Papr_pool_t; server_conf: Pserver_rec): Integer
 
 {
  * predicate indicating if a graceful stop has been requested ...
- * used by the connection loop 
+ * used by the connection loop
  * @return 1 if a graceful stop has been requested, 0 otherwise
  * @deffunc int ap_graceful_stop_signalled(*void)
  }
@@ -94,14 +94,14 @@ function ap_graceful_stop_signalled: Integer;
  * Spawn a process with privileges that another module has requested
  * @param r The request_rec of the current request
  * @param newproc The resulting process handle.
- * @param progname The program to run 
- * @param const_args the arguments to pass to the new program.  The first 
+ * @param progname The program to run
+ * @param const_args the arguments to pass to the new program.  The first
  *                   one should be the program name.
- * @param env The new environment apr_table_t for the new process.  This 
+ * @param env The new environment apr_table_t for the new process.  This
  *            should be a list of NULL-terminated strings.
  * @param attr the procattr we should use to determine how to create the new
  *         process
- * @param p The pool to use. 
+ * @param p The pool to use.
  }
 function ap_os_create_privileged_process(
  const r: Prequest_rec;
@@ -143,7 +143,7 @@ const
   AP_MPMQ_MPM_STATE           = 13;  { starting, running, stopping  }
 
 {
- * Query a property of the current MPM.  
+ * Query a property of the current MPM.
  * @param query_code One of APM_MPMQ_*
  * @param result A location to place the result of the query
  * @return APR_SUCCESS or APR_ENOTIMPL

+ 2 - 2
packages/httpd20/src/ap_release.inc

@@ -27,10 +27,10 @@ const
  * The tokens are listed in order of their significance for identifying the
  * application.
  *
- * "Product tokens should be short and to the point -- use of them for 
+ * "Product tokens should be short and to the point -- use of them for
  * advertizing or other non-essential information is explicitly forbidden."
  *
- * Example: "Apache/1.1.0 MrWidget/0.1-alpha" 
+ * Example: "Apache/1.1.0 MrWidget/0.1-alpha"
  }
   AP_SERVER_BASEVENDOR = 'Apache Software Foundation';
   AP_SERVER_BASEPRODUCT = 'Apache';

+ 9 - 9
packages/httpd20/src/apr/apr.pas

@@ -62,7 +62,7 @@ uses
 {$ENDIF}
   SysUtils, ctypes;
 {$ENDIF FPC_DOTTEDUNITS}
-  
+
 const
 {$IFDEF WINDOWS}
   LibAPR = 'libapr.dll';
@@ -112,7 +112,7 @@ type
   apr_socklen_t = Integer;
   apr_byte_t = byte;
   papr_byte_t = apr_byte_t;
-  
+
   apr_uint32_tso_handle_t = cuint;
 
 type
@@ -135,12 +135,12 @@ type
   Papr_int16_t = ^SmallInt;
 
   // Network structures
-  
+
   sockaddr = record
     sa_family: cushort;    // address family, AF_xxx
     sa_data: array [1..14] of AnsiChar;  // (NBO) 14 bytes of protocol address
   end;
-  
+
 {$ifndef windows}
 
   va_list = Pointer;
@@ -155,7 +155,7 @@ type
     sin_addr: in_addr;     // see struct in_addr, below
     sin_zero: array [1..8] of AnsiChar;  // zero this if you want to
   end;
-  
+
 {$endif}
 
   in6_addr = record
@@ -177,7 +177,7 @@ type
   end;
 
   // TEMPORARY
-  
+
   Papr_xml_ns_scope = Pointer;
 
   Pap_method_list_t = Pointer;
@@ -193,7 +193,7 @@ type
     /// data to be read/written
     iov_base: PAnsiChar;
   end;
-  
+
   Piovec = ^iovec;
 
 {$include apr_errno.inc}
@@ -247,9 +247,9 @@ var
 begin
   buf[0] := c;
   buf[1] := #0;
-  
+
   buf := StrLower(@buf[0]);
-  
+
   Result := buf[0];
 end;
 

+ 1 - 1
packages/httpd20/src/apr/apr_allocator.inc

@@ -26,7 +26,7 @@
 
 {
  * @defgroup apr_allocator Internal Memory Allocation
- * @ingroup APR 
+ * @ingroup APR
  }
 
 type

+ 24 - 24
packages/httpd20/src/apr/apr_buckets.inc

@@ -128,12 +128,12 @@ type
     { This bucket type represents metadata. }
     APR_BUCKET_METADATA = 1
   );
-  
+
   destroy_t = procedure (data: Pointer);
 
   read_t = function (b: Papr_bucket; const str: PPAnsiChar; len: Papr_size_t;
    block: apr_read_type_e): apr_status_t;
-                         
+
   setaside_t = function (e: Papr_bucket; pool: Papr_pool_t): apr_status_t;
 
   split_t = function (e: Papr_bucket; point: apr_size_t): apr_status_t;
@@ -179,13 +179,13 @@ type
      *  for all bucket types.
      * @param b The bucket to read from
      * @param str A place to store the data read.  Allocation should only be
-     *            done if absolutely necessary. 
+     *            done if absolutely necessary.
      * @param len The amount of data read.
      * @param block Should this read function block if there is more data that
      *              cannot be read immediately.
      }
     read: read_t;
-    
+
     {
      * Make it possible to set aside the data for at least as long as the
      *  given pool. Buckets containing data that could potentially die before
@@ -240,7 +240,7 @@ type
   apr_bucket = record
     { Links to the rest of the brigade }
     link: link_t;
-    
+
     { The type of bucket.  }
     type_: Papr_bucket_type_t;
     { The length of the data in the bucket.  This could have been implemented
@@ -253,7 +253,7 @@ type
      *  pointer.  The vast majority of bucket types allow a fixed block of
      *  data to be referenced by multiple buckets, each bucket pointing to
      *  a different segment of the data.  That segment starts at base+start
-     *  and ends at base+start+length.  
+     *  and ends at base+start+length.
      *  If the length == (apr_size_t)(-1), then start == -1.
      }
     start: apr_off_t;
@@ -262,7 +262,7 @@ type
     {
      * Pointer to function used to free the bucket. This function should
      * always be defined and it should be consistent with the memory
-     * function used to allocate the bucket. For example, if malloc() is 
+     * function used to allocate the bucket. For example, if malloc() is
      * used to allocate the bucket, this pointer should point to free().
      * @param e Pointer to the bucket being freed
      }
@@ -272,7 +272,7 @@ type
   end;
 
   { A list of buckets }
-  
+
   apr_bucket_list = record
     next: Papr_bucket;
     prev: Papr_bucket;
@@ -280,7 +280,7 @@ type
 
   apr_bucket_brigade = record
     { The pool to associate the brigade with.  The data is not allocated out
-     *  of the pool, but a cleanup is registered with this pool.  If the 
+     *  of the pool, but a cleanup is registered with this pool.  If the
      *  brigade is destroyed by some mechanism other than pool destruction,
      *  the destroying function is responsible for killing the cleanup.
      }
@@ -730,7 +730,7 @@ type
 
 {
  * destroy an entire bucket brigade.  This includes destroying all of the
- * buckets within the bucket brigade's bucket list. 
+ * buckets within the bucket brigade's bucket list.
  * @param b The bucket brigade to destroy
  }
 //APU_DECLARE(apr_status_t) apr_brigade_destroy(apr_bucket_brigade *b);
@@ -775,7 +775,7 @@ type
 //#if APR_NOT_DONE_YET
 {
  * consume nbytes from beginning of b -- call apr_bucket_destroy as
- * appropriate, and/or modify start on last element 
+ * appropriate, and/or modify start on last element
  * @param b The brigade to consume data from
  * @param nbytes The number of bytes to consume
  }
@@ -831,7 +831,7 @@ type
                                                  apr_off_t maxbytes);
 }
 {
- * create an iovec of the elements in a bucket_brigade... return number 
+ * create an iovec of the elements in a bucket_brigade... return number
  * of elements used.  This is useful for writing to a file or to the
  * network efficiently.
  * @param b The bucket brigade to create the iovec from
@@ -843,7 +843,7 @@ type
                                                struct iovec *vec, int *nvec);
 }
 {
- * This function writes a list of strings into a bucket brigade. 
+ * This function writes a list of strings into a bucket brigade.
  * @param b The bucket brigade to add to
  * @param flush The flush function to use if the brigade is full
  * @param ctx The structure to pass to the flush function
@@ -920,7 +920,7 @@ type
                                                      void *ctx, ...);
 }
 {
- * Evaluate a printf and put the resulting string at the end 
+ * Evaluate a printf and put the resulting string at the end
  * of the bucket brigade.
  * @param b The brigade to write to
  * @param flush The flush function to use if the brigade is full
@@ -936,7 +936,7 @@ type
         __attribute__((format(printf,4,5)));
 }
 {
- * Evaluate a printf and put the resulting string at the end 
+ * Evaluate a printf and put the resulting string at the end
  * of the bucket brigade.
  * @param b The brigade to write to
  * @param flush The flush function to use if the brigade is full
@@ -1222,7 +1222,7 @@ type
  * @return The new bucket, or NULL if allocation failed
  }
 {APU_DECLARE(apr_bucket *) apr_bucket_shared_make(apr_bucket *b, void *data,
-				                 apr_off_t start, 
+				                 apr_off_t start,
                                                  apr_size_t length);
 }
 {
@@ -1283,8 +1283,8 @@ type
 //APU_DECLARE(apr_bucket *) apr_bucket_eos_create(apr_bucket_alloc_t *list);
 
 {
- * Make the bucket passed in an EOS bucket.  This indicates that there is no 
- * more data coming from down the filter stack.  All filters should flush at 
+ * Make the bucket passed in an EOS bucket.  This indicates that there is no
+ * more data coming from down the filter stack.  All filters should flush at
  * this point.
  * @param b The bucket to make into an EOS bucket
  * @return The new bucket, or NULL if allocation failed
@@ -1301,8 +1301,8 @@ type
 //APU_DECLARE(apr_bucket *) apr_bucket_flush_create(apr_bucket_alloc_t *list);
 
 {
- * Make the bucket passed in a FLUSH  bucket.  This indicates that filters 
- * should flush their data.  There is no guarantee that they will flush it, 
+ * Make the bucket passed in a FLUSH  bucket.  This indicates that filters
+ * should flush their data.  There is no guarantee that they will flush it,
  * but this is the best we can do.
  * @param b The bucket to make into a FLUSH bucket
  * @return The new bucket, or NULL if allocation failed
@@ -1328,7 +1328,7 @@ type
  * @return The new bucket, or NULL if allocation failed
  }
 {APU_DECLARE(apr_bucket *) apr_bucket_immortal_make(apr_bucket *b,
-                                                   const AnsiChar *buf, 
+                                                   const AnsiChar *buf,
                                                    apr_size_t nbyte);
 }
 {
@@ -1407,7 +1407,7 @@ type
  * @return The new bucket, or NULL if allocation failed
  }
 {APU_DECLARE(apr_bucket *) apr_bucket_pool_make(apr_bucket *b, const AnsiChar *buf,
-                                               apr_size_t length, 
+                                               apr_size_t length,
                                                apr_pool_t *pool);}
 
 //#if APR_HAS_MMAP
@@ -1435,7 +1435,7 @@ type
  * @return The new bucket, or NULL if allocation failed
  }
 {APU_DECLARE(apr_bucket *) apr_bucket_mmap_make(apr_bucket *b, apr_mmap_t *mm,
-                                               apr_off_t start, 
+                                               apr_off_t start,
                                                apr_size_t length);
 #endif}
 
@@ -1486,7 +1486,7 @@ type
  }
 {APU_DECLARE(apr_bucket *) apr_bucket_file_create(apr_file_t *fd,
                                                  apr_off_t offset,
-                                                 apr_size_t len, 
+                                                 apr_size_t len,
                                                  apr_pool_t *p,
                                                  apr_bucket_alloc_t *list);
 }

+ 1 - 1
packages/httpd20/src/apr/apr_dso.inc

@@ -25,7 +25,7 @@
 
 {
  * @defgroup apr_dso Dynamic Object Handling
- * @ingroup APR 
+ * @ingroup APR
  }
 
 {$define APR_HAS_DSO}

+ 49 - 49
packages/httpd20/src/apr/apr_errno.inc

@@ -27,7 +27,7 @@
 
 {
  * @defgroup apr_errno Error Codes
- * @ingroup APR 
+ * @ingroup APR
  }
 
 {
@@ -64,7 +64,7 @@ function apr_strerror(statcode: apr_status_t; buf: PAnsiChar; bufsize: apr_size_
  * Fold an apr_status_t code back to the native platform defined error.
  * @param e The apr_status_t folded platform os error code.
  * @warning  macro implementation; the statcode argument may be evaluated
- *      multiple times.  If the statcode was not created by apr_get_os_error 
+ *      multiple times.  If the statcode was not created by apr_get_os_error
  *      or APR_FROM_OS_ERROR, the results are undefined.
  }
 #define APR_TO_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
@@ -100,7 +100,7 @@ function apr_strerror(statcode: apr_status_t; buf: PAnsiChar; bufsize: apr_size_
  * @warning This is a macro implementation; the statcode argument may be evaluated
  *      multiple times.  If the statcode was not created by apr_get_os_error
  *      or APR_FROM_OS_ERROR, the results are undefined.  This macro sets
- *      errno, or calls a WSASetLastError() style function, unfolding 
+ *      errno, or calls a WSASetLastError() style function, unfolding
  *      socketcode with APR_TO_OS_ERROR.
  }
 
@@ -140,12 +140,12 @@ const
  }
   APR_OS_START_CANONERR = (APR_OS_START_USERERR + (APR_OS_ERRSPACE_SIZE * 10));
 {
- * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into 
+ * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into
  *     apr_status_t values.
  }
   APR_OS_START_EAIERR =   (APR_OS_START_CANONERR + APR_OS_ERRSPACE_SIZE);
 {
- * APR_OS_START_SYSERR folds platform-specific system error values into 
+ * APR_OS_START_SYSERR folds platform-specific system error values into
  *     apr_status_t values.
  }
   APR_OS_START_SYSERR =   (APR_OS_START_EAIERR + APR_OS_ERRSPACE_SIZE);
@@ -157,9 +157,9 @@ const
  * @defgroup APR_Error APR Error Values
  * <PRE>
  * <b>APR ERROR VALUES</b>
- * APR_ENOSTAT      APR was unable to perform a stat on the file 
+ * APR_ENOSTAT      APR was unable to perform a stat on the file
  * APR_ENOPOOL      APR was not provided a pool with which to allocate memory
- * APR_EBADDATE     APR was given an invalid date 
+ * APR_EBADDATE     APR was given an invalid date
  * APR_EINVALSOCK   APR was given an invalid socket
  * APR_ENOPROC      APR was not given a process structure
  * APR_ENOTIME      APR was not given a time structure
@@ -170,7 +170,7 @@ const
  * APR_ENOTHREAD    APR was not given a thread structure
  * APR_ENOTHDKEY    APR was not given a thread key structure
  * APR_ENOSHMAVAIL  There is no more shared memory available
- * APR_EDSOOPEN     APR was unable to open the dso object.  For more 
+ * APR_EDSOOPEN     APR was unable to open the dso object.  For more
  *                  information call apr_dso_error().
  * APR_EGENERAL     General failure (specific information not available)
  * APR_EBADIP       The specified IP address is invalid
@@ -190,17 +190,17 @@ const
  * APR_INCOMPLETE     The operation was incomplete although some processing
  *                    was performed and the results are partially valid
  * APR_BADCH          Getopt found an option not in the option string
- * APR_BADARG         Getopt found an option that is missing an argument 
+ * APR_BADARG         Getopt found an option that is missing an argument
  *                    and an argument was specified in the option string
  * APR_EOF            APR has encountered the end of the file
  * APR_NOTFOUND       APR was unable to find the socket in the poll structure
  * APR_ANONYMOUS      APR is using anonymous shared memory
  * APR_FILEBASED      APR is using a file name as the key to the shared memory
  * APR_KEYBASED       APR is using a shared key as the key to the shared memory
- * APR_EINIT          Ininitalizer value.  If no option has been found, but 
+ * APR_EINIT          Ininitalizer value.  If no option has been found, but
  *                    the status variable requires a value, this should be used
- * APR_ENOTIMPL       The APR function has not been implemented on this 
- *                    platform, either because nobody has gotten to it yet, 
+ * APR_ENOTIMPL       The APR function has not been implemented on this
+ *                    platform, either because nobody has gotten to it yet,
  *                    or the function is impossible on this platform.
  * APR_EMISMATCH      Two passwords do not match.
  * APR_EABSOLUTE      The given path was absolute.
@@ -275,15 +275,15 @@ const
  *      adjust the order of the tests accordingly.
  }
 {
- * APR was unable to perform a stat on the file 
+ * APR was unable to perform a stat on the file
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_ENOSTAT(s)        ((s) == APR_ENOSTAT)
 {
- * APR was not provided a pool with which to allocate memory 
+ * APR was not provided a pool with which to allocate memory
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_ENOPOOL(s)        ((s) == APR_ENOPOOL)
 { APR was given an invalid date  }
@@ -316,7 +316,7 @@ const
 //#define APR_STATUS_IS_EBADMASK(s)       ((s) == APR_EBADMASK)
 { empty slot: +18 }
 {
- * APR was unable to open the dso object.  
+ * APR was unable to open the dso object.
  * For more information call apr_dso_error().
  }
 //#if defined(WIN32)
@@ -401,51 +401,51 @@ const
  * @addtogroup APR_STATUS_IS
  }
 {
- * Program is currently executing in the child 
+ * Program is currently executing in the child
  * @warning
  * always use this test, as platform-specific variances may meet this
  * more than one error code }
 //#define APR_STATUS_IS_INCHILD(s)        ((s) == APR_INCHILD)
 {
- * Program is currently executing in the parent 
+ * Program is currently executing in the parent
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_INPARENT(s)       ((s) == APR_INPARENT)
 {
- * The thread is detached 
+ * The thread is detached
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_DETACH(s)         ((s) == APR_DETACH)
 {
- * The thread is not detached 
+ * The thread is not detached
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_NOTDETACH(s)      ((s) == APR_NOTDETACH)
 {
  * The child has finished executing
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_CHILD_DONE(s)     ((s) == APR_CHILD_DONE)
 {
  * The child has not finished executing
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_CHILD_NOTDONE(s)  ((s) == APR_CHILD_NOTDONE)
 {
  * The operation did not finish before the timeout
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP)
 {
@@ -453,7 +453,7 @@ const
  * and the results are partially valid.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_INCOMPLETE(s)     ((s) == APR_INCOMPLETE)
 { empty slot: +9 }
@@ -463,29 +463,29 @@ const
  * Getopt found an option not in the option string
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_BADCH(s)          ((s) == APR_BADCH)
 {
- * Getopt found an option not in the option string and an argument was 
+ * Getopt found an option not in the option string and an argument was
  * specified in the option string
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_BADARG(s)         ((s) == APR_BADARG)
 {
  * APR has encountered the end of the file
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_EOF(s)            ((s) == APR_EOF)
 {
  * APR was unable to find the socket in the poll structure
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_NOTFOUND(s)       ((s) == APR_NOTFOUND)
 { empty slot: +16 }
@@ -495,51 +495,51 @@ const
  * APR is using anonymous shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_ANONYMOUS(s)      ((s) == APR_ANONYMOUS)
 {
  * APR is using a file name as the key to the shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_FILEBASED(s)      ((s) == APR_FILEBASED)
 {
  * APR is using a shared key as the key to the shared memory
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_KEYBASED(s)       ((s) == APR_KEYBASED)
 {
- * Ininitalizer value.  If no option has been found, but 
+ * Ininitalizer value.  If no option has been found, but
  * the status variable requires a value, this should be used
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_EINIT(s)          ((s) == APR_EINIT)
 {
- * The APR function has not been implemented on this 
- * platform, either because nobody has gotten to it yet, 
+ * The APR function has not been implemented on this
+ * platform, either because nobody has gotten to it yet,
  * or the function is impossible on this platform.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_ENOTIMPL(s)       ((s) == APR_ENOTIMPL)
 {
  * Two passwords do not match.
  * @warning
  * always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_EMISMATCH(s)      ((s) == APR_EMISMATCH)
 {
  * The given lock was busy
  * @warning always use this test, as platform-specific variances may meet this
- * more than one error code 
+ * more than one error code
  }
 //#define APR_STATUS_IS_EBUSY(s)          ((s) == APR_EBUSY)
 
@@ -632,7 +632,7 @@ const
 #endif
 }
 {
- * @see APR_STATUS_IS_EAGAIN 
+ * @see APR_STATUS_IS_EAGAIN
  * @warning use APR_STATUS_IS_EAGAIN instead of just testing this value
  }
 {#ifdef EAGAIN
@@ -863,7 +863,7 @@ const
 #define APR_STATUS_IS_ECONNRESET(s)     ((s) == APR_ECONNRESET \
                 || (s) == APR_OS_START_SYSERR + SOCECONNRESET)
 #define APR_STATUS_IS_ETIMEDOUT(s)      ((s) == APR_ETIMEDOUT \
-                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)    
+                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
 #define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
                 || (s) == APR_OS_START_SYSERR + SOCEHOSTUNREACH)
 #define APR_STATUS_IS_ENETUNREACH(s)    ((s) == APR_ENETUNREACH \
@@ -1152,14 +1152,14 @@ const
 //#define APR_STATUS_IS_EINPROGRESS(s)    ((s) == APR_EINPROGRESS)
 
 {
- * Software caused connection abort 
+ * Software caused connection abort
  * @remark
- * EPROTO on certain older kernels really means ECONNABORTED, so we need to 
+ * EPROTO on certain older kernels really means ECONNABORTED, so we need to
  * ignore it for them.  See discussion in new-httpd archives nh.9701 & nh.9603
  *
- * There is potentially a bug in Solaris 2.x x<6, and other boxes that 
+ * There is potentially a bug in Solaris 2.x x<6, and other boxes that
  * implement tcp sockets in userland (i.e. on top of STREAMS).  On these
- * systems, EPROTO can actually result in a fatal loop.  See PR#981 for 
+ * systems, EPROTO can actually result in a fatal loop.  See PR#981 for
  * example.  It's hard to handle both uses of EPROTO.
  }
 {#ifdef EPROTO

+ 24 - 24
packages/httpd20/src/apr/apr_file_info.inc

@@ -32,7 +32,7 @@
 
 {
  * @defgroup apr_file_info File Information
- * @ingroup APR 
+ * @ingroup APR
  }
 
 { Many applications use the type member to determine the
@@ -43,8 +43,8 @@
 { apr_filetype_e values for the filetype member of the
  * apr_file_info_t structure
  * @warning: Not all of the filetypes below can be determined.
- * For example, a given platform might not correctly report 
- * a socket descriptor as APR_SOCK if that type isn't 
+ * For example, a given platform might not correctly report
+ * a socket descriptor as APR_SOCK if that type isn't
  * well-identified on that platform.  In such cases where
  * a filetype exists but cannot be described by the recognized
  * flags below, the filetype will be APR_UNKFILE.  If the
@@ -65,7 +65,7 @@ type
   );
 
 {
- * @defgroup apr_file_permissions File Permissions flags 
+ * @defgroup apr_file_permissions File Permissions flags
  * @
  }
 
@@ -97,7 +97,7 @@ type
   apr_dir_t = record end;
   Papr_dir_t = ^apr_dir_t;
   PPapr_dir_t = ^Papr_dir_t;
-  
+
 {
  * Structure for determining file permissions.
  }
@@ -197,18 +197,18 @@ type
     { The file's handle, if accessed (can be submitted to apr_duphandle) }
     filehand: Papr_file_t;
   end;
-  
+
   Papr_finfo_t = ^apr_finfo_t;
 
 {
- * get the specified file's stats.  The file is specified by filename, 
+ * get the specified file's stats.  The file is specified by filename,
  * instead of using a pre-opened file.
  * @param finfo Where to store the information about the file, which is
  * never touched if the call fails.
  * @param fname The name of the file to stat.
  * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_
-                 values 
- * @param cont the pool to use to allocate the new file. 
+                 values
+ * @param cont the pool to use to allocate the new file.
  *
  * @note If @c APR_INCOMPLETE is returned all the fields in @a finfo may
  *       not be filled in, and you need to check the @c finfo->valid bitmask
@@ -220,15 +220,15 @@ function apr_stat(finfo: Papr_finfo_t; const fname: PAnsiChar;
  external LibAPR name LibNamePrefix + 'apr_stat' + LibSuff16;
 
 {
- * get the specified file's stats.  The file is specified by filename, 
+ * get the specified file's stats.  The file is specified by filename,
  * instead of using a pre-opened file.  If the file is a symlink, this function
  * will get the stats for the symlink not the file the symlink refers to.
  * @param finfo Where to store the information about the file, which is
  * never touched if the call fails.
  * @param fname The name of the file to stat.
- * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values 
- * @param cont the pool to use to allocate the new file. 
- * @deprecated This function is deprecated, it's equivalent to calling apr_stat with 
+ * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values
+ * @param cont the pool to use to allocate the new file.
+ * @deprecated This function is deprecated, it's equivalent to calling apr_stat with
  * the wanted flag value APR_FINFO_LINK
  }
 function apr_lstat(finfo: Papr_finfo_t; const fname: PAnsiChar;
@@ -252,7 +252,7 @@ function apr_dir_open(new_dir: PPapr_dir_t; const dirname: PAnsiChar;
  external LibAPR name LibNamePrefix + 'apr_dir_open' + LibSuff12;
 
 {
- * close the specified directory. 
+ * close the specified directory.
  * @param thedir the directory descriptor to close.
  }
 function apr_dir_close(thedir: Papr_dir_t): apr_status_t;
@@ -260,10 +260,10 @@ function apr_dir_close(thedir: Papr_dir_t): apr_status_t;
  external LibAPR name LibNamePrefix + 'apr_dir_close' + LibSuff4;
 
 {
- * Read the next entry from the specified directory. 
+ * Read the next entry from the specified directory.
  * @param finfo the file info structure and filled in by apr_dir_read
  * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_
-                 values 
+                 values
  * @param thedir the directory descriptor returned from apr_dir_open
  * @remark No ordering is guaranteed for the entries read.
  *
@@ -311,7 +311,7 @@ const
   APR_FILEPATH_NATIVE =        $10;
 
 { Resolve the true case of existing directories and file elements
- * of addpath, (resolving any aliases on Win32) and append a proper 
+ * of addpath, (resolving any aliases on Win32) and append a proper
  * trailing slash if a directory
  }
   APR_FILEPATH_TRUENAME =      $20;
@@ -327,12 +327,12 @@ const
  * </PRE>
  * @param p the pool to allocate the new path string from
  * @remark on return, filepath points to the first non-root character in the
- * given filepath.  In the simplest example, given a filepath of "/foo", 
- * returns the rootpath of "/" and filepath points at "foo".  This is far 
+ * given filepath.  In the simplest example, given a filepath of "/foo",
+ * returns the rootpath of "/" and filepath points at "foo".  This is far
  * more complex on other platforms, which will canonicalize the root form
  * to a consistant format, given the APR_FILEPATH_TRUENAME flag, and also
- * test for the validity of that root (e.g., that a drive d:/ or network 
- * share //machine/foovol/). 
+ * test for the validity of that root (e.g., that a drive d:/ or network
+ * share //machine/foovol/).
  * The function returns APR_ERELATIVE if filepath isn't rooted (an
  * error), APR_EINCOMPLETE if the root path is ambigious (but potentially
  * legitimate, e.g. "/" on Windows is incomplete because it doesn't specify
@@ -351,9 +351,9 @@ function apr_filepath_root(const rootpath, filepath: PPAnsiChar;
  * @param addpath the path to add to the root path
  * @param flags the desired APR_FILEPATH_ rules to apply when merging
  * @param p the pool to allocate the new path string from
- * @remark if the flag APR_FILEPATH_TRUENAME is given, and the addpath 
- * contains wildcard characters ('*', '?') on platforms that don't support 
- * such characters within filenames, the paths will be merged, but the 
+ * @remark if the flag APR_FILEPATH_TRUENAME is given, and the addpath
+ * contains wildcard characters ('*', '?') on platforms that don't support
+ * such characters within filenames, the paths will be merged, but the
  * result code will be APR_EPATHWILD, and all further segments will not
  * reflect the true filenames including the wildcard and following segments.
  }

+ 56 - 56
packages/httpd20/src/apr/apr_file_io.inc

@@ -32,7 +32,7 @@
 
 {
  * @defgroup apr_file_io File I/O Handling Functions
- * @ingroup APR 
+ * @ingroup APR
  }
 
 {
@@ -134,7 +134,7 @@ const
  *         APR_CREATE            create the file if not there
  *         APR_APPEND            file ptr is set to end prior to all writes
  *         APR_TRUNCATE          set length to zero if file exists
- *         APR_BINARY            not a text file (This flag is ignored on 
+ *         APR_BINARY            not a text file (This flag is ignored on
  *                               UNIX because it has no meaning)
  *         APR_BUFFERED          buffer the data.  Default is non-buffered
  *         APR_EXCL              return error if APR_CREATE and file exists
@@ -144,7 +144,7 @@ const
  *         APR_SHARELOCK         Platform dependent support for higher
  *                               level locked read/write access to support
  *                               writes across process/machines
- *         APR_FILE_NOCLEANUP    Do not register a cleanup with the pool 
+ *         APR_FILE_NOCLEANUP    Do not register a cleanup with the pool
  *                               passed in on the <EM>cont</EM> argument (see below).
  *                               The apr_os_file_t handle in apr_file_t will not
  *                               be closed when the pool is destroyed.
@@ -154,8 +154,8 @@ const
  * </PRE>
  * @param perm Access permissions for file.
  * @param pool The pool to use.
- * @remark If perm is APR_OS_DEFAULT and the file is being created, appropriate 
- *      default permissions will be used.  *arg1 must point to a valid file_t, 
+ * @remark If perm is APR_OS_DEFAULT and the file is being created, appropriate
+ *      default permissions will be used.  *arg1 must point to a valid file_t,
  *      or NULL (in which case it will be allocated)
  }
 function apr_file_open(newf: PPapr_file_t; const fname: PAnsiChar;
@@ -187,7 +187,7 @@ function apr_file_remove(const path: PAnsiChar; cont: Papr_pool_t): apr_status_t
  * @param from_path The full path to the original file (using / on all systems)
  * @param to_path The full path to the new file (using / on all systems)
  * @param pool The pool to use.
- * @warning If a file exists at the new location, then it will be overwritten.  
+ * @warning If a file exists at the new location, then it will be overwritten.
  *      Moving files or directories across devices may not be possible.
  }
 function apr_file_rename(const from_path, to_path: PAnsiChar; pool: Papr_pool_t): apr_status_t;
@@ -240,11 +240,11 @@ function apr_file_eof(fptr: Papr_file_t): apr_status_t;
  * open standard error as an apr file pointer.
  * @param thefile The apr file to use as stderr.
  * @param cont The pool to allocate the file out of.
- * 
+ *
  * @remark The only reason that the apr_file_open_std* functions exist
  * is that you may not always have a stderr/out/in on Windows.  This
  * is generally a problem with newer versions of Windows and services.
- * 
+ *
  * The other problem is that the C library functions generally work
  * differently on Windows and Unix.  So, by using apr_file_open_std*
  * functions, you can get a handle to an APR struct that works with
@@ -260,11 +260,11 @@ function apr_file_open_stderr(thefile: PPapr_file_t;
  * open standard output as an apr file pointer.
  * @param thefile The apr file to use as stdout.
  * @param cont The pool to allocate the file out of.
- * 
+ *
  * @remark The only reason that the apr_file_open_std* functions exist
  * is that you may not always have a stderr/out/in on Windows.  This
  * is generally a problem with newer versions of Windows and services.
- * 
+ *
  * The other problem is that the C library functions generally work
  * differently on Windows and Unix.  So, by using apr_file_open_std*
  * functions, you can get a handle to an APR struct that works with
@@ -280,11 +280,11 @@ function apr_file_open_stdout(thefile: PPapr_file_t;
  * open standard input as an apr file pointer.
  * @param thefile The apr file to use as stdin.
  * @param cont The pool to allocate the file out of.
- * 
+ *
  * @remark The only reason that the apr_file_open_std* functions exist
  * is that you may not always have a stderr/out/in on Windows.  This
  * is generally a problem with newer versions of Windows and services.
- * 
+ *
  * The other problem is that the C library functions generally work
  * differently on Windows and Unix.  So, by using apr_file_open_std*
  * functions, you can get a handle to an APR struct that works with
@@ -301,14 +301,14 @@ function apr_file_open_stdin(thefile: PPapr_file_t;
  * @param thefile The file descriptor to read from.
  * @param buf The buffer to store the data to.
  * @param nbytes On entry, the number of bytes to read; on exit, the number of bytes read.
- * @remark apr_file_read will read up to the specified number of bytes, but 
- *         never more.  If there isn't enough data to fill that number of 
- *         bytes, all of the available data is read.  The third argument is 
- *         modified to reflect the number of bytes read.  If a AnsiChar was put 
- *         back into the stream via ungetc, it will be the first character 
- *         returned. 
+ * @remark apr_file_read will read up to the specified number of bytes, but
+ *         never more.  If there isn't enough data to fill that number of
+ *         bytes, all of the available data is read.  The third argument is
+ *         modified to reflect the number of bytes read.  If a AnsiChar was put
+ *         back into the stream via ungetc, it will be the first character
+ *         returned.
  *
- *         It is not possible for both bytes to be read and an APR_EOF or other 
+ *         It is not possible for both bytes to be read and an APR_EOF or other
  *         error to be returned.
  *
  *         APR_EINTR is never returned.
@@ -322,12 +322,12 @@ function apr_file_read(thefile: Papr_file_t; buf: Pointer;
  * Write data to the specified file.
  * @param thefile The file descriptor to write to.
  * @param buf The buffer which contains the data.
- * @param nbytes On entry, the number of bytes to write; on exit, the number 
+ * @param nbytes On entry, the number of bytes to write; on exit, the number
  *               of bytes written.
- * @remark apr_file_write will write up to the specified number of bytes, but never 
- *      more.  If the OS cannot write that many bytes, it will write as many 
- *      as it can.  The third argument is modified to reflect the * number 
- *      of bytes written. 
+ * @remark apr_file_write will write up to the specified number of bytes, but never
+ *      more.  If the OS cannot write that many bytes, it will write as many
+ *      as it can.  The third argument is modified to reflect the * number
+ *      of bytes written.
  *
  *      It is possible for both bytes to be written and an error to be returned.
  *
@@ -342,14 +342,14 @@ function apr_file_write(thefile: Papr_file_t; buf: Pointer;
  * Write data from iovec array to the specified file.
  * @param thefile The file descriptor to write to.
  * @param vec The array from which to get the data to write to the file.
- * @param nvec The number of elements in the struct iovec array. This must 
- *             be smaller than APR_MAX_IOVEC_SIZE.  If it isn't, the function 
+ * @param nvec The number of elements in the struct iovec array. This must
+ *             be smaller than APR_MAX_IOVEC_SIZE.  If it isn't, the function
  *             will fail with APR_EINVAL.
  * @param nbytes The number of bytes written.
  * @remark It is possible for both bytes to be written and an error to be returned.
  *      APR_EINTR is never returned.
  *
- *      apr_file_writev is available even if the underlying operating system 
+ *      apr_file_writev is available even if the underlying operating system
  *
  *      doesn't provide writev().
  }
@@ -365,13 +365,13 @@ function apr_file_writev(thefile: Papr_file_t; const vec: Piovec;
  * @param buf The buffer to store the data to.
  * @param nbytes The number of bytes to read.
  * @param bytes_read If non-NULL, this will contain the number of bytes read.
- * @remark apr_file_read will read up to the specified number of bytes, but never 
- *      more.  If there isn't enough data to fill that number of bytes, 
- *      then the process/thread will block until it is available or EOF 
- *      is reached.  If a AnsiChar was put back into the stream via ungetc, 
- *      it will be the first character returned. 
+ * @remark apr_file_read will read up to the specified number of bytes, but never
+ *      more.  If there isn't enough data to fill that number of bytes,
+ *      then the process/thread will block until it is available or EOF
+ *      is reached.  If a AnsiChar was put back into the stream via ungetc,
+ *      it will be the first character returned.
  *
- *      It is possible for both bytes to be read and an error to be 
+ *      It is possible for both bytes to be read and an error to be
  *      returned.  And if *bytes_read is less than nbytes, an
  *      accompanying error is _always_ returned.
  *
@@ -389,12 +389,12 @@ function apr_file_read_full(thefile: Papr_file_t; buf: Pointer;
  * @param buf The buffer which contains the data.
  * @param nbytes The number of bytes to write.
  * @param bytes_written If non-NULL, this will contain the number of bytes written.
- * @remark apr_file_write will write up to the specified number of bytes, but never 
- *      more.  If the OS cannot write that many bytes, the process/thread 
- *      will block until they can be written. Exceptional error such as 
+ * @remark apr_file_write will write up to the specified number of bytes, but never
+ *      more.  If the OS cannot write that many bytes, the process/thread
+ *      will block until they can be written. Exceptional error such as
  *      "out of space" or "pipe closed" will terminate with an error.
  *
- *      It is possible for both bytes to be written and an error to be 
+ *      It is possible for both bytes to be written and an error to be
  *      returned.  And if *bytes_written is less than nbytes, an
  *      accompanying error is _always_ returned.
  *
@@ -434,7 +434,7 @@ function apr_file_ungetc(ch: AnsiChar; thefile: PPapr_file_t): apr_status_t;
 
 {
  * Get a string from a specified file.
- * @param str The buffer to store the string in. 
+ * @param str The buffer to store the string in.
  * @param len The length of the string
  * @param thefile The file descriptor to read from
  * @remark The buffer will be '\0'-terminated if any characters are stored.
@@ -446,7 +446,7 @@ function apr_file_gets(str: PAnsiChar; len: Integer;
 
 {
  * Put the string into a specified file.
- * @param str The string to write. 
+ * @param str The string to write.
  * @param thefile The file descriptor to write to
  }
 function apr_file_puts(const str: PAnsiChar; thefile: Papr_file_t): apr_status_t;
@@ -463,7 +463,7 @@ function apr_file_flush(thefile: PPapr_file_t): apr_status_t;
 
 {
  * duplicate the specified file descriptor.
- * @param new_file The structure to duplicate into. 
+ * @param new_file The structure to duplicate into.
  * @param old_file The file to duplicate.
  * @param p The pool to use for the new file.
  * @remark *new_file must point to a valid apr_file_t, or point to NULL
@@ -508,8 +508,8 @@ function apr_file_setaside(new_file: PPapr_file_t; old_file: PPapr_file_t;
  * @param where How to move the pointer, one of:
  * <PRE>
  *            APR_SET  --  set the offset to offset
- *            APR_CUR  --  add the offset to the current position 
- *            APR_END  --  add the offset to the current file size 
+ *            APR_CUR  --  add the offset to the current position
+ *            APR_END  --  add the offset to the current file size
  * </PRE>
  * @param offset The offset to move the pointer to.
  * @remark The third argument is modified to be the offset the pointer
@@ -545,7 +545,7 @@ function apr_file_namedpipe_create(const filename: PAnsiChar;
 {
  * Get the timeout value for a pipe or manipulate the blocking state.
  * @param thepipe The pipe we are getting a timeout for.
- * @param timeout The current timeout value in microseconds. 
+ * @param timeout The current timeout value in microseconds.
  }
 function apr_file_pipe_timeout_get(thepipe: Papr_file_t;
  timeout: Papr_interval_time_t): apr_status_t;
@@ -555,7 +555,7 @@ function apr_file_pipe_timeout_get(thepipe: Papr_file_t;
 {
  * Set the timeout value for a pipe or manipulate the blocking state.
  * @param thepipe The pipe we are setting a timeout on.
- * @param timeout The timeout value in microseconds.  Values < 0 mean wait 
+ * @param timeout The timeout value in microseconds.  Values < 0 mean wait
  *        forever, 0 means do not wait at all.
  }
 function apr_file_pipe_timeout_set(thepipe: Papr_file_t;
@@ -590,7 +590,7 @@ function apr_file_unlock(thefile: Papr_file_t): apr_status_t;
 
 {
  * return the file name of the current file.
- * @param new_path The path of the file.  
+ * @param new_path The path of the file.
  * @param thefile The currently open file.
  }
 function apr_file_name_get(const newpath: PPAnsiChar; thefile: Papr_file_t): apr_status_t;
@@ -599,7 +599,7 @@ function apr_file_name_get(const newpath: PPAnsiChar; thefile: Papr_file_t): apr
 
 {
  * Return the data associated with the current file.
- * @param data The user data associated with the file.  
+ * @param data The user data associated with the file.
  * @param key The key to use for retreiving data associated with this file.
  * @param file The currently open file.
  }
@@ -611,7 +611,7 @@ function apr_file_data_get(data: PPointer; const key: PAnsiChar;
 {
  * Set the data associated with the current file.
  * @param file The currently open file.
- * @param data The user data to associate with the file.  
+ * @param data The user data to associate with the file.
  * @param key The key to use for assocaiteing data with the file.
  * @param cleanup The cleanup routine to use when the file is destroyed.
  }
@@ -637,8 +637,8 @@ function apr_file_printf(fptr: Papr_file_t; const format: PAnsiChar;
  * set the specified file's permission bits.
  * @param fname The file (name) to apply the permissions to.
  * @param perms The permission bits to apply to the file.
- * @warning Some platforms may not be able to apply all of the available 
- *      permission bits; APR_INCOMPLETE will be returned if some permissions 
+ * @warning Some platforms may not be able to apply all of the available
+ *      permission bits; APR_INCOMPLETE will be returned if some permissions
  *      are specified which could not be set.
  *
  *      Platforms which do not implement this feature will return APR_ENOTIMPL.
@@ -720,7 +720,7 @@ function apr_dir_remove(const path: PAnsiChar; cont: Papr_pool_t): apr_status_t;
 {
  * get the specified file's stats.
  * @param finfo Where to store the information about the file.
- * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values 
+ * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values
  * @param thefile The file to get information about.
  }
 function apr_file_info_get(finfo: Papr_finfo_t;
@@ -773,15 +773,15 @@ function apr_file_flags_get(f: Papr_file_t): apr_int32_t;
  * @param fp The apr file to use as a temporary file.
  * @param templ The template to use when creating a temp file.
  * @param flags The flags to open the file with. If this is zero,
- *              the file is opened with 
+ *              the file is opened with
  *              APR_CREATE | APR_READ | APR_WRITE | APR_EXCL | APR_DELONCLOSE
  * @param p The pool to allocate the file out of.
- * @remark   
- * This function  generates  a unique temporary file name from template.  
- * The last six characters of template must be XXXXXX and these are replaced 
+ * @remark
+ * This function  generates  a unique temporary file name from template.
+ * The last six characters of template must be XXXXXX and these are replaced
  * with a string that makes the filename unique. Since it will  be  modified,
  * template must not be a string constant, but should be declared as a character
- * array.  
+ * array.
  *
  }
 function apr_file_mktemp(fp: PPapr_file_t; templ: PAnsiChar;
@@ -793,7 +793,7 @@ function apr_file_mktemp(fp: PPapr_file_t; templ: PAnsiChar;
  * Find an existing directory suitable as a temporary storage location.
  * @param temp_dir The temp directory.
  * @param p The pool to use for any necessary allocations.
- * @remark   
+ * @remark
  * This function uses an algorithm to search for a directory that an
  * an application can use for temporary storage.  Once such a
  * directory is found, that location is cached by the library.  Thus,

+ 8 - 8
packages/httpd20/src/apr/apr_general.inc

@@ -32,7 +32,7 @@
 
 {
  * @defgroup apr_general Miscellaneous library routines
- * @ingroup APR 
+ * @ingroup APR
  * This is collection of oddballs that didn't fit anywhere else,
  * and might move to more appropriate headers with the release
  * of APR 1.0.
@@ -153,7 +153,7 @@ void *memchr(const void *s, int c, size_t n);
  }
 
 {
- * Setup any APR internal data structures.  This MUST be the first function 
+ * Setup any APR internal data structures.  This MUST be the first function
  * called for any APR library.
  * @remark See apr_app_initialize if this is an application, rather than
  * a library consumer of apr.
@@ -179,9 +179,9 @@ function apr_app_initialize(argc: PInteger; argv, env: PPAnsiChar): apr_status_t
  external LibAPR name LibNamePrefix + 'apr_app_initialize' + LibSuff12;
 
 {
- * Tear down any APR internal data structures which aren't torn down 
+ * Tear down any APR internal data structures which aren't torn down
  * automatically.
- * @remark An APR program must call this function at termination once it 
+ * @remark An APR program must call this function at termination once it
  *         has stopped using APR services.  The APR developers suggest using
  *         atexit to ensure this is called.  When using APR from a language
  *         other than C that has problems with the calling convention, use
@@ -191,12 +191,12 @@ procedure apr_terminate;
  cdecl; external LibAPR name 'apr_terminate';
 
 {
- * Tear down any APR internal data structures which aren't torn down 
+ * Tear down any APR internal data structures which aren't torn down
  * automatically, same as apr_terminate
- * @remark An APR program must call either the apr_terminate or apr_terminate2 
- *         function once it it has finished using APR services.  The APR 
+ * @remark An APR program must call either the apr_terminate or apr_terminate2
+ *         function once it it has finished using APR services.  The APR
  *         developers suggest using atexit(apr_terminate) to ensure this is done.
- *         apr_terminate2 exists to allow non-c language apps to tear down apr, 
+ *         apr_terminate2 exists to allow non-c language apps to tear down apr,
  *         while apr_terminate is recommended from c language applications.
  }
 procedure apr_terminate2;

+ 3 - 3
packages/httpd20/src/apr/apr_hash.inc

@@ -23,7 +23,7 @@
 
 {
  * @defgroup apr_hash Hash Tables
- * @ingroup APR 
+ * @ingroup APR
  * @
  }
 
@@ -112,7 +112,7 @@ function apr_hash_get(ht: Papr_hash_t; const key: Pointer;
  }
 {
  * <PRE>
- * 
+ *
  * int sum_values(apr_pool_t *p, apr_hash_t *ht)
  * (
  *     apr_hash_index_t *hi;
@@ -133,7 +133,7 @@ function apr_hash_first(p: Papr_pool_t; ht: Papr_hash_t): Papr_hash_index_t;
 {
  * Continue iterating over the entries in a hash table.
  * @param hi The iteration state
- * @return a pointer to the updated iteration state.  NULL if there are no more  
+ * @return a pointer to the updated iteration state.  NULL if there are no more
  *         entries.
  }
 function apr_hash_next(hi: Papr_hash_index_t): Papr_hash_index_t;

+ 2 - 2
packages/httpd20/src/apr/apr_lib.inc

@@ -34,7 +34,7 @@
 
 {
  * @defgroup apr_lib General Purpose Library Routines
- * @ingroup APR 
+ * @ingroup APR
  * This is collection of oddballs that didn't fit anywhere else,
  * and might move to more appropriate headers with the release
  * of APR 1.0.
@@ -162,7 +162,7 @@ function apr_filename_of_pathname(const pathname: PAnsiChar): PAnsiChar;
  }
 type
   flush_func_t = function (b: Papr_vformatter_buff_t): Integer;
-  
+
 function apr_vformatter(flush_func: flush_func_t;
  c: Papr_vformatter_buff_t; const fmt: PAnsiChar; ap: va_list): Integer;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}

+ 40 - 40
packages/httpd20/src/apr/apr_network_io.inc

@@ -23,7 +23,7 @@
 #include "apr_pools.h"
 #include "apr_file_io.h"
 #include "apr_errno.h"
-#include "apr_inherit.h" 
+#include "apr_inherit.h"
 
 #if APR_HAVE_NETINET_IN_H
 #include <netinet/in.h>
@@ -31,7 +31,7 @@
 
 {
  * @defgroup apr_network_io Network Routines
- * @ingroup APR 
+ * @ingroup APR
  }
 
 const
@@ -72,7 +72,7 @@ const
   APR_INCOMPLETE_READ = 4096;  {< Set on non-blocking sockets
 				   * (timeout != 0) on which the
 				   * previous read() did not fill a buffer
-				   * completely.  the next apr_socket_recv() 
+				   * completely.  the next apr_socket_recv()
                                    * will first call select()/poll() rather than
 				   * going straight into read().  (Can also
 				   * be set by an application to force a
@@ -236,7 +236,7 @@ type
 {
  * Support reusing the socket on platforms which support it (from disconnect,
  * specifically Win32.
- * @remark Optional flag passed into apr_socket_sendfile() 
+ * @remark Optional flag passed into apr_socket_sendfile()
  }
   APR_SENDFILE_DISCONNECT_SOCKET     = 1;
 {$endif}
@@ -257,7 +257,7 @@ type
 
 {
  * Create a socket.
- * @remark With APR 1.0, this function follows the prototype 
+ * @remark With APR 1.0, this function follows the prototype
  * of apr_socket_create_ex.
  * @param new_sock The new socket that has been set up.
  * @param family The address family of the socket (e.g., APR_INET).
@@ -271,7 +271,7 @@ function apr_socket_create(new_sock: PPapr_socket_t;
 
 {
  * Create a socket.
- * @remark With APR 1.0, this function is deprecated and apr_socket_create 
+ * @remark With APR 1.0, this function is deprecated and apr_socket_create
  * follows this prototype.
  * @param new_sock The new socket that has been set up.
  * @param family The address family of the socket (e.g., APR_INET).
@@ -286,12 +286,12 @@ function apr_socket_create_ex(new_sock: PPapr_socket_t;
 
 {
  * Shutdown either reading, writing, or both sides of a socket.
- * @param thesocket The socket to close 
+ * @param thesocket The socket to close
  * @param how How to shutdown the socket.  One of:
  * <PRE>
  *            APR_SHUTDOWN_READ         no longer allow read requests
  *            APR_SHUTDOWN_WRITE        no longer allow write requests
- *            APR_SHUTDOWN_READWRITE    no longer allow read or write requests 
+ *            APR_SHUTDOWN_READWRITE    no longer allow read or write requests
  * </PRE>
  * @see apr_shutdown_how_e
  * @remark This does not actually close the socket descriptor, it just
@@ -310,7 +310,7 @@ function apr_shutdown(thesocket: Papr_socket_t;
 
 {
  * Close a socket.
- * @param thesocket The socket to close 
+ * @param thesocket The socket to close
  }
 function apr_socket_close(thesocket: Papr_socket_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -318,7 +318,7 @@ function apr_socket_close(thesocket: Papr_socket_t): apr_status_t;
 
 {
  * Bind the socket to its associated port
- * @param sock The socket to bind 
+ * @param sock The socket to bind
  * @param sa The socket address to bind to
  * @remark This may be where we will find out if there is any other process
  *      using the selected port.
@@ -336,10 +336,10 @@ function apr_bind(sock: Papr_socket_t;
 
 {
  * Listen to a bound socket for connections.
- * @param sock The socket to listen on 
+ * @param sock The socket to listen on
  * @param backlog The number of outstanding connections allowed in the sockets
  *                listen queue.  If this value is less than zero, the listen
- *                queue size is set to zero.  
+ *                queue size is set to zero.
  }
 function apr_socket_listen(sock: Papr_socket_t;
  backlog: apr_int32_t): apr_status_t;
@@ -371,11 +371,11 @@ function apr_socket_accept(new_sock: PPapr_socket_t;
                                      apr_pool_t *connection_pool);}
 
 {
- * Issue a connection request to a socket either on the same machine 
+ * Issue a connection request to a socket either on the same machine
  * or a different one.
- * @param sock The socket we wish to use for our side of the connection 
+ * @param sock The socket we wish to use for our side of the connection
  * @param sa The address of the machine we wish to connect to.  If NULL,
- *           APR assumes that the sockaddr_in in the apr_socket is 
+ *           APR assumes that the sockaddr_in in the apr_socket is
  *           completely filled out.
  }
 function apr_socket_connect(sock: Papr_socket_t; sa: Papr_sockaddr_t): apr_status_t;
@@ -390,7 +390,7 @@ function apr_socket_connect(sock: Papr_socket_t; sa: Papr_sockaddr_t): apr_statu
  * @param sa The new apr_sockaddr_t.
  * @param hostname The hostname or numeric address string to resolve/parse, or
  *               NULL to build an address that corresponds to 0.0.0.0 or ::
- * @param family The address family to use, or APR_UNSPEC if the system should 
+ * @param family The address family to use, or APR_UNSPEC if the system should
  *               decide.
  * @param port The port number.
  * @param flags Special processing flags:
@@ -439,19 +439,19 @@ function apr_getnameinfo(hostname: PPAnsiChar; sa: Papr_socket_t; flags: apr_int
  *   [abc]                 (not valid IPv6 numeric address string)
  *   abc:65536             (invalid port number)
  *
- * @param addr The new buffer containing just the hostname.  On output, *addr 
+ * @param addr The new buffer containing just the hostname.  On output, *addr
  *             will be NULL if no hostname/IP address was specfied.
- * @param scope_id The new buffer containing just the scope id.  On output, 
+ * @param scope_id The new buffer containing just the scope id.  On output,
  *                 *scope_id will be NULL if no scope id was specified.
- * @param port The port number.  On output, *port will be 0 if no port was 
+ * @param port The port number.  On output, *port will be 0 if no port was
  *             specified.
  *             ### FIXME: 0 is a legal port (per RFC 1700). this should
  *             ### return something besides zero if the port is missing.
  * @param str The input string to be parsed.
  * @param p The pool from which *addr and *scope_id are allocated.
- * @remark If scope id shouldn't be allowed, check for scope_id != NULL in 
- *         addition to checking the return code.  If addr/hostname should be 
- *         required, check for addr == NULL in addition to checking the 
+ * @remark If scope id shouldn't be allowed, check for scope_id != NULL in
+ *         addition to checking the return code.  If addr/hostname should be
+ *         required, check for addr == NULL in addition to checking the
  *         return code.
  }
 function apr_parse_addr_port(addr, scope_id: PPAnsiChar; port: Papr_port_t;
@@ -491,7 +491,7 @@ function apr_socket_data_get(data: PPointer; const key: PAnsiChar;
  }
 type
   cleanup_t = function (param: Pointer): apr_status_t;
-  
+
 function apr_socket_data_set(sock: Papr_socket_t; data: Pointer;
  const key: PAnsiChar; cleanup: cleanup_t): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
@@ -500,12 +500,12 @@ function apr_socket_data_set(sock: Papr_socket_t; data: Pointer;
 {
  * Send data over a network.
  * @param sock The socket to send the data over.
- * @param buf The buffer which contains the data to be sent. 
+ * @param buf The buffer which contains the data to be sent.
  * @param len On entry, the number of bytes to send; on exit, the number
  *            of bytes sent.
  * @remark
  * <PRE>
- * This functions acts like a blocking write by default.  To change 
+ * This functions acts like a blocking write by default.  To change
  * this behavior, use apr_socket_timeout_set().
  *
  * It is possible for both bytes to be sent and an error to be returned.
@@ -525,12 +525,12 @@ function apr_socket_send(sock: Papr_socket_t; const buf: PAnsiChar;
 {
  * Send multiple packets of data over a network.
  * @param sock The socket to send the data over.
- * @param vec The array of iovec structs containing the data to send 
+ * @param vec The array of iovec structs containing the data to send
  * @param nvec The number of iovec structs in the array
  * @param len Receives the number of bytes actually written
  * @remark
  * <PRE>
- * This functions acts like a blocking write by default.  To change 
+ * This functions acts like a blocking write by default.  To change
  * this behavior, use apr_socket_timeout_set().
  * The number of bytes actually sent is stored in argument 3.
  *
@@ -563,7 +563,7 @@ function apr_socket_sendto(sock: Papr_socket_t; where: Papr_sockaddr_t;
 
 { @deprecated @see apr_socket_sendto }
 {APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                                     apr_int32_t flags, const AnsiChar *buf, 
+                                     apr_int32_t flags, const AnsiChar *buf,
                                      apr_size_t *len);}
 
 {
@@ -580,23 +580,23 @@ function apr_socket_recvfrom(from: Papr_sockaddr_t; sock: Papr_socket_t;
 
 { @deprecated @see apr_socket_recvfrom }
 {APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
-                                       apr_int32_t flags, AnsiChar *buf, 
+                                       apr_int32_t flags, AnsiChar *buf,
                                        apr_size_t *len);}
 
 {$if defined(APR_HAS_SENDFILE) or defined(DOXYGEN)}
 
 {
- * Send a file from an open file descriptor to a socket, along with 
+ * Send a file from an open file descriptor to a socket, along with
  * optional headers and trailers
  * @param sock The socket to which we're writing
  * @param file The open file from which to read
  * @param hdtr A structure containing the headers and trailers to send
  * @param offset Offset into the file where we should begin writing
- * @param len (input)  - Number of bytes to send from the file 
- *            (output) - Number of bytes actually sent, 
+ * @param len (input)  - Number of bytes to send from the file
+ *            (output) - Number of bytes actually sent,
  *                       including headers, file, and trailers
  * @param flags APR flags that are mapped to OS specific flags
- * @remark This functions acts like a blocking write by default.  To change 
+ * @remark This functions acts like a blocking write by default.  To change
  *         this behavior, use apr_socket_timeout_set().
  *         The number of bytes actually sent is stored in argument 5.
  }
@@ -616,12 +616,12 @@ function apr_socket_sendfile(sock: Papr_socket_t; file_: Papr_file_t;
 {
  * Read data from a network.
  * @param sock The socket to read the data from.
- * @param buf The buffer to store the data in. 
+ * @param buf The buffer to store the data in.
  * @param len On entry, the number of bytes to receive; on exit, the number
  *            of bytes received.
  * @remark
  * <PRE>
- * This functions acts like a blocking read by default.  To change 
+ * This functions acts like a blocking read by default.  To change
  * this behavior, use apr_socket_timeout_set().
  * The number of bytes actually sent is stored in argument 3.
  *
@@ -644,7 +644,7 @@ function apr_socket_recv(sock: Papr_socket_t; buf: PAnsiChar; len: Papr_size_t):
  * @param sock The socket to set up.
  * @param opt The option we would like to configure.  One of:
  * <PRE>
- *            APR_SO_DEBUG      --  turn on debugging information 
+ *            APR_SO_DEBUG      --  turn on debugging information
  *            APR_SO_KEEPALIVE  --  keep connections active
  *            APR_SO_LINGER     --  lingers on close if data is present
  *            APR_SO_NONBLOCK   --  Turns blocking on/off for socket
@@ -684,7 +684,7 @@ function apr_socket_timeout_set(sock: Papr_socket_t; t: apr_interval_time_t): ap
  * @param sock The socket to query
  * @param opt The option we would like to query.  One of:
  * <PRE>
- *            APR_SO_DEBUG      --  turn on debugging information 
+ *            APR_SO_DEBUG      --  turn on debugging information
  *            APR_SO_KEEPALIVE  --  keep connections active
  *            APR_SO_LINGER     --  lingers on close if data is present
  *            APR_SO_NONBLOCK   --  Turns blocking on/off for socket
@@ -758,7 +758,7 @@ function apr_sockaddr_port_get(port: Papr_port_t; sockaddr: Papr_sockaddr_t): ap
 
 {
  * Set the IP address in an APR socket address.
- * @param sockaddr The socket address to use 
+ * @param sockaddr The socket address to use
  * @param addr The IP address to attach to the socket.
  *             Use APR_ANYADDR to use any IP addr on the machine.
  * @deprecated @see apr_sockaddr_info_get
@@ -769,7 +769,7 @@ function apr_sockaddr_ip_set(sockaddr: Papr_sockaddr_t; const addr: PAnsiChar):
 
 {
  * Return the IP address (in numeric address string format) in
- * an APR socket address.  APR will allocate storage for the IP address 
+ * an APR socket address.  APR will allocate storage for the IP address
  * string from the pool of the apr_sockaddr_t.
  * @param addr The IP address.
  * @param sockaddr The socket address to reference.
@@ -849,7 +849,7 @@ function apr_ipsubnet_test(ipsub: Papr_ipsubnet_t; sa: Papr_sockaddr_t): Integer
  * @param sock The socket to put the accept filter on.
  * @param name The accept filter
  * @param args Any extra args to the accept filter.  Passing NULL here removes
- *             the accept filter. 
+ *             the accept filter.
  }
 function apr_socket_accept_filter(sock: Papr_socket_t; name, args: PAnsiChar): apr_status_t;
  {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}

Some files were not shown because too many files changed in this diff