Amaya/amaya/query.c - diff

Return to query.c CVS log

Up to [Public] / Amaya / amaya

Diff for /Amaya/amaya/query.c between versions 1.119 and 1.120

version 1.119, 1998/08/18 14:41:15	version 1.120, 1998/08/19 14:07:43
Line 97 static boolean AmayaAlive; /* set t	Line 97 static boolean AmayaAlive; /* set t
/* prototypes */	/* prototypes */

#ifdef __STDC__	#ifdef __STDC__
#ifdef _WINDOWS	#ifdef __WINDOWS
int WIN_Activate_Request (HTRequest* , HTAlertOpcode, int, const char, void, HTAlertPar*);	int WIN_Activate_Request (HTRequest* , HTAlertOpcode, int, const char, void, HTAlertPar*);
#endif /* _WINDOWS */	#endif /* _WINDOWS */
#else	#else
#ifdef _WINDOWS	#ifdef __WINDOWS
int WIN_Activate_Request ();	int WIN_Activate_Request ();
#endif /* _WINDOWS */	#endif /* _WINDOWS */
#endif /* __STDC__ */	#endif /* __STDC__ */
Line 1073 static void AHTAlertInit ()	Line 1073 static void AHTAlertInit ()
#endif	#endif
{	{
HTAlert_add (AHTProgress, HT_A_PROGRESS);	HTAlert_add (AHTProgress, HT_A_PROGRESS);
#ifdef _WINDOWS	#ifdef __WINDOWS
HTAlert_add ((HTAlertCallback *) WIN_Activate_Request, HT_PROG_CONNECT);	HTAlert_add ((HTAlertCallback *) WIN_Activate_Request, HT_PROG_CONNECT);
#endif /* _WINDOWS */	#endif /* _WINDOWS */
HTAlert_add (AHTError_print, HT_A_MESSAGE);	HTAlert_add (AHTError_print, HT_A_MESSAGE);
Line 1089 static void AHTAlertInit ()	Line 1089 static void AHTAlertInit ()
#endif /* AMAYA_WWW_CACHE */	#endif /* AMAYA_WWW_CACHE */
}	}

	#ifndef _WINDOWS
	/* @@@ needs specific win functions */
#ifdef AMAYA_WWW_CACHE	#ifdef AMAYA_WWW_CACHE
/*----------------------------------------------------------------------	/*----------------------------------------------------------------------
CleanCache	CleanCache
Line 1156 char *dirname;	Line 1158 char *dirname;
rmdir (dirname);	rmdir (dirname);
}	}
#endif /* AMAYA_WWW_CACHE */	#endif /* AMAYA_WWW_CACHE */
	#endif /* !_WINDOWS */

/*----------------------------------------------------------------------	/*----------------------------------------------------------------------
CacheInit	CacheInit
Line 1226 static void Cacheinit ()	Line 1229 static void Cacheinit ()
strcpy (strptr, cache_dir);	strcpy (strptr, cache_dir);
/* @@@ add DIRSEP */	/* @@@ add DIRSEP */
strcat (strptr, "/");	strcat (strptr, "/");
	#ifndef _WINDOWS
CleanCache (strptr);	CleanCache (strptr);
	#endif /* !_WINDOWS */
}	}
TtaFreeMemory (strptr);	TtaFreeMemory (strptr);

Line 1377 static void AHTProfile_delete ()	Line 1382 static void AHTProfile_delete ()

if (HTLib_isInitialized ())	if (HTLib_isInitialized ())

# ifdef _WINDOWS	#ifdef _WINDOWS
HTEventTerminate ();	HTEventTerminate ();
# endif _WINDOWS;	#endif _WINDOWS;

/* Clean up the persistent cache (if any) */	/* Clean up the persistent cache (if any) */
#ifdef AMAYA_WWW_CACHE	#ifdef AMAYA_WWW_CACHE
Line 1431 void QueryInit ()	Line 1436 void QueryInit ()
/* New AHTBridge stuff */	/* New AHTBridge stuff */

#ifdef _WINDOWS	#ifdef _WINDOWS
AHTEventInit ();	/* AHTEventInit (); this was the call to my AHTEvent module HTEvtLst today*/
	HTEventInit;
#endif /* _WINDOWS */	#endif /* _WINDOWS */

HTEvent_setRegisterCallback ((void *) AHTEvent_register);	HTEvent_setRegisterCallback ((void *) AHTEvent_register);
HTEvent_setUnregisterCallback ((void *) AHTEvent_unregister);	HTEvent_setUnregisterCallback ((void *) AHTEvent_unregister);

#ifndef _WINDOWS	#ifndef _WINDOWS
HTTimer_registerSetTimerCallback ((void *) SetTimer);	HTTimer_registerSetTimerCallback ((void *) AMAYA_SetTimer);
HTTimer_registerDeleteTimerCallback ((void *) DeleteTimer);	HTTimer_registerDeleteTimerCallback ((void *) AMAYA_DeleteTimer);
#endif /* !_WINDOWS */	#endif /* !_WINDOWS */

#ifdef AMAYA_WWW_CACHE	#ifdef AMAYA_WWW_CACHE
Line 1478 void QueryInit ()	Line 1484 void QueryInit ()
HTNet_setMaxSocket (8);	HTNet_setMaxSocket (8);
/* different network services timeouts */	/* different network services timeouts */
HTDNS_setTimeout (60);	HTDNS_setTimeout (60);
#ifdef _WINDOWS	#ifdef __WINDOWS
/* under windows, the libwww persistent socket handling has	/* under windows, the libwww persistent socket handling has
** some bugs. The following line inhibits idle socket reusal.	** some bugs. The following line inhibits idle socket reusal.
** this is a bit slower, but avoids crashes and gives us time	** this is a bit slower, but avoids crashes and gives us time
Line 1997 char *content_type;	Line 2003 char *content_type;
}	}
else	else
/* end treatment for SYNC requests */	/* end treatment for SYNC requests */
	if ((mode & AMAYA_SYNC) \|\| (mode & AMAYA_ISYNC))
if ((mode & AMAYA_SYNC) \|\| (mode & AMAYA_ISYNC))	{
{
#ifndef _WINDOWS	#ifndef _WINDOWS
/* part of the UNIX stop button handler */	/* part of the UNIX stop button handler */
if (status != HT_ERROR)	if (status != HT_ERROR)
status = LoopForStop (me);	status = LoopForStop (me);
#endif /* _!WINDOWS */	#endif /* _!WINDOWS */
	/* @@@ this doesn't seem correct ... me->request may not exist ... */
if (!HTRequest_kill (me->request))	if (!HTRequest_kill (me->request))
AHTReqContext_delete (me);	AHTReqContext_delete (me);
}	}
return (status);	return (status);
}	}

/*----------------------------------------------------------------------	/*----------------------------------------------------------------------
Line 2173 void *context_tcbf;	Line 2178 void *context_tcbf;
/* part of the stop button handler */	/* part of the stop button handler */
if ((mode & AMAYA_SYNC) \|\| (mode & AMAYA_ISYNC))	if ((mode & AMAYA_SYNC) \|\| (mode & AMAYA_ISYNC))
{	{
	#ifndef _WINDOWS
status = LoopForStop (me);	status = LoopForStop (me);
	#endif /* _WINDOWS */
	if (!HTRequest_kill (me->request))
	AHTReqContext_delete (me);
}	}
}	}
else	else

Webmaster

Removed from v.1.119
changed lines
	Added in v.1.120