Skip to content

Commit 1e408c2

Browse files
yungcomputerchairyungcomputerchair
committed
Cleanup logging
1 parent 3740c6a commit 1e408c2

2 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎ffrunner.c‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ getNPIdentifier(const char *s)
4848
NPError
4949
NPN_GetURLProc(NPP instance, const char* url, const char* window)
5050
{
51-
logmsg("< NPN_GetURLProc:%p, url: %s, window: %s\n", instance, url, window);
51+
dbglogmsg("< NPN_GetURLProc:%p, url: %s, window: %s\n", instance, url, window);
5252

5353
register_get_request(url, false, NULL);
5454

@@ -58,7 +58,7 @@ NPN_GetURLProc(NPP instance, const char* url, const char* window)
5858
NPError
5959
NPN_GetURLNotifyProc(NPP instance, const char* url, const char* window, void* notifyData)
6060
{
61-
logmsg("< NPN_GetURLNotifyProc:%p, url: %s, window: %s, notifyData: %p\n", instance, url, window, notifyData);
61+
dbglogmsg("< NPN_GetURLNotifyProc:%p, url: %s, window: %s, notifyData: %p\n", instance, url, window, notifyData);
6262

6363
register_get_request(url, true, notifyData);
6464

@@ -68,7 +68,7 @@ NPN_GetURLNotifyProc(NPP instance, const char* url, const char* window, void* no
6868
NPError
6969
NPN_PostURLProc(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
7070
{
71-
logmsg("< NPN_PostURLProc:%p, url: %s, window: %s, len: %d, buf: %s, file: %d\n",
71+
dbglogmsg("< NPN_PostURLProc:%p, url: %s, window: %s, len: %d, buf: %s, file: %d\n",
7272
instance, url, window, len, buf, file);
7373

7474
register_post_request(url, false, NULL, len, buf);
@@ -79,7 +79,7 @@ NPN_PostURLProc(NPP instance, const char* url, const char* window, uint32_t len,
7979
NPError
8080
NPN_PostURLNotifyProc(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData)
8181
{
82-
logmsg("< NPN_PostURLNotifyProc:%p, url: %s, window: %s, len: %d, buf: %s, file: %d, notifyData: %p\n",
82+
dbglogmsg("< NPN_PostURLNotifyProc:%p, url: %s, window: %s, len: %d, buf: %s, file: %d, notifyData: %p\n",
8383
instance, url, window, len, buf, file, notifyData);
8484

8585
register_post_request(url, true, notifyData, len, buf);
@@ -90,36 +90,36 @@ NPN_PostURLNotifyProc(NPP instance, const char* url, const char* window, uint32_
9090
const char *
9191
NPN_UserAgentProc(NPP instance)
9292
{
93-
logmsg("< NPN_UserAgentProc, NPP:%p\n", instance);
93+
dbglogmsg("< NPN_UserAgentProc, NPP:%p\n", instance);
9494
return USERAGENT;
9595
}
9696

9797
bool
9898
NPN_GetPropertyProc(NPP npp, NPObject *obj, NPIdentifier propertyName, NPVariant *result)
9999
{
100-
logmsg("< NPN_GetPropertyProc\n");
100+
dbglogmsg("< NPN_GetPropertyProc\n");
101101
return false;
102102
}
103103

104104
bool
105105
NPN_InvokeProc(NPP npp, NPObject* obj, NPIdentifier methodName, const NPVariant *args, uint32_t argCount, NPVariant *result)
106106
{
107-
logmsg("< NPN_InvokeProc:%p, obj: %p, methodName: %p, argCount:%d\n", npp, obj, methodName, argCount);
107+
dbglogmsg("< NPN_InvokeProc:%p, obj: %p, methodName: %p, argCount:%d\n", npp, obj, methodName, argCount);
108108
return false;
109109
}
110110

111111
void
112112
NPN_ReleaseVariantValueProc(NPVariant *variant)
113113
{
114-
logmsg("< NPN_ReleaseVariantValueProc\n");
114+
dbglogmsg("< NPN_ReleaseVariantValueProc\n");
115115
}
116116

117117
NPObject *
118118
NPN_CreateObjectProc(NPP npp, NPClass *aClass)
119119
{
120120
NPObject *npobj;
121121

122-
logmsg("< NPN_CreateObjectProc\n");
122+
dbglogmsg("< NPN_CreateObjectProc\n");
123123
assert(aClass);
124124

125125
if (aClass->allocate)
@@ -138,7 +138,7 @@ NPN_CreateObjectProc(NPP npp, NPClass *aClass)
138138
NPObject *
139139
NPN_RetainObjectProc(NPObject *obj)
140140
{
141-
logmsg("< NPN_RetainObjectProc\n");
141+
dbglogmsg("< NPN_RetainObjectProc\n");
142142
assert(obj);
143143
obj->referenceCount++;
144144
return obj;
@@ -147,7 +147,7 @@ NPN_RetainObjectProc(NPObject *obj)
147147
void
148148
NPN_ReleaseObjectProc(NPObject *obj)
149149
{
150-
logmsg("< NPN_ReleaseObjectProc\n");
150+
dbglogmsg("< NPN_ReleaseObjectProc\n");
151151
assert(obj);
152152

153153
obj->referenceCount--;
@@ -168,7 +168,7 @@ NPN_GetValueProc(NPP instance, NPNVariable variable, void *ret_value)
168168
{
169169
NPObject **retPtr;
170170

171-
logmsg("< NPN_GetValueProc %d\n", variable);
171+
dbglogmsg("< NPN_GetValueProc %d\n", variable);
172172

173173
browserObject.referenceCount++;
174174

@@ -254,7 +254,7 @@ NPN_EvaluateProc(NPP npp, NPObject *obj, NPString *script, NPVariant *result)
254254
{
255255
char *navigationTarget;
256256

257-
logmsg("< NPN_EvaluateProc %s\n", script->UTF8Characters);
257+
dbglogmsg("< NPN_EvaluateProc %s\n", script->UTF8Characters);
258258

259259
/* Evaluates JS calls, like MarkProgress(1), most of which doesn't need to do anything. */
260260
if (strncmp(script->UTF8Characters, HOMEPAGE_CALLBACK_SCRIPT, sizeof(HOMEPAGE_CALLBACK_SCRIPT)) == 0
@@ -284,7 +284,7 @@ NPN_EvaluateProc(NPP npp, NPObject *obj, NPString *script, NPVariant *result)
284284
NPIdentifier
285285
NPN_GetStringIdentifierProc(const NPUTF8* name)
286286
{
287-
logmsg("< NPN_GetStringIdentifierProc %s\n", name);
287+
dbglogmsg("< NPN_GetStringIdentifierProc %s\n", name);
288288

289289
return getNPIdentifier(name);
290290
}
@@ -294,7 +294,7 @@ NPN_GetStringIdentifiersProc(const NPUTF8** names, int32_t nameCount, NPIdentifi
294294
{
295295
int i;
296296

297-
logmsg("< NPN_GetStringIdentifiersProc %d\n", nameCount);
297+
dbglogmsg("< NPN_GetStringIdentifiersProc %d\n", nameCount);
298298

299299
for (i = 0; i < nameCount; i++) {
300300
identifiers[i] = getNPIdentifier(names[i]);
@@ -310,7 +310,7 @@ NPAllocateFunction(NPP instance, NPClass *aClass)
310310
{
311311
NPObject *npobj;
312312

313-
logmsg("< NPAllocateFunction %p\n", aClass);
313+
dbglogmsg("< NPAllocateFunction %p\n", aClass);
314314
assert(aClass);
315315

316316
if (aClass->allocate)
@@ -329,7 +329,7 @@ NPAllocateFunction(NPP instance, NPClass *aClass)
329329
void
330330
NPDeallocateFunction(NPObject *npobj)
331331
{
332-
logmsg("< NPDeallocateFunction %p\n", npobj);
332+
dbglogmsg("< NPDeallocateFunction %p\n", npobj);
333333
assert(npobj != &browserObject);
334334

335335
free(npobj);
@@ -338,77 +338,77 @@ NPDeallocateFunction(NPObject *npobj)
338338
void
339339
NPInvalidateFunction(NPObject *npobj)
340340
{
341-
logmsg("< NPInvalidateFunction %p\n", npobj);
341+
dbglogmsg("< NPInvalidateFunction %p\n", npobj);
342342
}
343343

344344
bool
345345
NPHasMethodFunction(NPObject *npobj, NPIdentifier name)
346346
{
347-
logmsg("< NPHasMethodFunction %p %p\n", npobj, name);
347+
dbglogmsg("< NPHasMethodFunction %p %p\n", npobj, name);
348348

349349
return 0;
350350
}
351351

352352
bool
353353
NPInvokeFunction(NPObject *npobj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result)
354354
{
355-
logmsg("< NPInvokeFunction %p %p\n", npobj, name);
355+
dbglogmsg("< NPInvokeFunction %p %p\n", npobj, name);
356356

357357
return 0;
358358
}
359359

360360
bool
361361
NPInvokeDefaultFunction(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
362362
{
363-
logmsg("< NPInvokeDefaultFunction %p\n", npobj);
363+
dbglogmsg("< NPInvokeDefaultFunction %p\n", npobj);
364364

365365
return 0;
366366
}
367367

368368
bool
369369
NPHasPropertyFunction(NPObject *npobj, NPIdentifier name)
370370
{
371-
logmsg("< NPHasPropertyFunction %p\n", npobj);
371+
dbglogmsg("< NPHasPropertyFunction %p\n", npobj);
372372

373373
return 0;
374374
}
375375

376376
bool
377377
NPGetPropertyFunction(NPObject *npobj, NPIdentifier name, NPVariant *result)
378378
{
379-
logmsg("< NPGetPropertyFunction %p\n", npobj);
379+
dbglogmsg("< NPGetPropertyFunction %p\n", npobj);
380380

381381
return 0;
382382
}
383383

384384
bool
385385
NPSetPropertyFunction(NPObject *npobj, NPIdentifier name, const NPVariant *value)
386386
{
387-
logmsg("< NPSetPropertyFunction %p\n", npobj);
387+
dbglogmsg("< NPSetPropertyFunction %p\n", npobj);
388388

389389
return 0;
390390
}
391391

392392
bool
393393
NPRemovePropertyFunction(NPObject *npobj, NPIdentifier name)
394394
{
395-
logmsg("< NPRemovePropertyFunction %p\n", npobj);
395+
dbglogmsg("< NPRemovePropertyFunction %p\n", npobj);
396396

397397
return 0;
398398
}
399399

400400
bool
401401
NPEnumerationFunction(NPObject *npobj, NPIdentifier **value, uint32_t *count)
402402
{
403-
logmsg("< NPEnumerationFunction %p\n", npobj);
403+
dbglogmsg("< NPEnumerationFunction %p\n", npobj);
404404

405405
return 0;
406406
}
407407

408408
bool
409409
NPConstructFunction(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
410410
{
411-
logmsg("< NPConstructFunction %p\n", npobj);
411+
dbglogmsg("< NPConstructFunction %p\n", npobj);
412412

413413
return 0;
414414
}
@@ -749,13 +749,13 @@ main(int argc, char **argv)
749749
prepare_window(args.windowWidth, args.windowHeight, iconToUse);
750750
assert(hwnd);
751751

752-
logmsg("> NP_GetEntryPoints\n");
752+
dbglogmsg("> NP_GetEntryPoints\n");
753753
ret = NP_GetEntryPoints(&pluginFuncs);
754-
logmsg("returned %d\n", ret);
754+
dbglogmsg(" returned %d\n", ret);
755755

756-
logmsg("> NP_Initialize\n");
756+
dbglogmsg("> NP_Initialize\n");
757757
ret = NP_Initialize(&netscapeFuncs);
758-
logmsg("returned %d\n", ret);
758+
dbglogmsg(" returned %d\n", ret);
759759

760760
char width[16], height[16];
761761
snprintf(width, sizeof(width), "%d", args.windowWidth);
@@ -789,9 +789,9 @@ main(int argc, char **argv)
789789

790790
savedPtr = &saved;
791791

792-
logmsg("> NPP_NewProc\n");
792+
dbglogmsg("> NPP_NewProc\n");
793793
ret = pluginFuncs.newp("application/vnd.ffuwp", &npp, 1, ARRLEN(argn), argn, argp, savedPtr);
794-
logmsg("returned %d\n", ret);
794+
dbglogmsg(" returned %d\n", ret);
795795

796796
ShowWindow(hwnd, SW_SHOWDEFAULT);
797797
UpdateWindow(hwnd);
@@ -818,25 +818,25 @@ main(int argc, char **argv)
818818
npWin.height = winRect.bottom - winRect.top;
819819
}
820820

821-
logmsg("> NPP_SetWindowProc\n");
821+
dbglogmsg("> NPP_SetWindowProc\n");
822822
ret = pluginFuncs.setwindow(&npp, &npWin);
823-
logmsg("returned %d\n", ret);
823+
dbglogmsg(" returned %d\n", ret);
824824

825825

826-
logmsg("> NPP_GetValueProc\n");
826+
dbglogmsg("> NPP_GetValueProc\n");
827827
ret = pluginFuncs.getvalue(&npp, NPPVpluginScriptableNPObject, &scriptableObject);
828-
logmsg("returned %d and NPObject %p\n", ret, scriptableObject);
828+
dbglogmsg(" returned %d and NPObject %p\n", ret, scriptableObject);
829829
assert(scriptableObject->_class);
830830

831-
logmsg("> scriptableObject.hasMethod style\n");
831+
dbglogmsg("> scriptableObject.hasMethod style\n");
832832
ret = scriptableObject->_class->hasMethod(scriptableObject, getNPIdentifier("style"));
833-
logmsg("returned %d\n", ret);
833+
dbglogmsg(" returned %d\n", ret);
834834

835835
message_loop();
836836

837-
logmsg("> NPP_DestroyProc\n");
837+
dbglogmsg("> NPP_DestroyProc\n");
838838
ret = pluginFuncs.destroy(&npp, &savedPtr);
839-
logmsg("returned %d\n", ret);
839+
dbglogmsg(" returned %d\n", ret);
840840

841841
return 0;
842842
}

‎requests.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ handle_io_progress(Request *req)
131131
req->stream->url = req->originalUrl;
132132
req->stream->end = req->sizeHint;
133133
req->stream->notifyData = req->notifyData;
134-
logmsg("> NPP_NewStream %s\n", req->originalUrl);
134+
dbglogmsg("> NPP_NewStream %s\n", req->originalUrl);
135135
err = pluginFuncs.newstream(&npp, req->mimeType, req->stream, false, &req->streamType);
136-
logmsg("returned %d\n", err);
136+
dbglogmsg(" returned %d\n", err);
137137
if (err != NPERR_NO_ERROR) {
138138
cancel_request(req);
139139
}
@@ -174,7 +174,7 @@ handle_io_progress(Request *req)
174174
assert(req->failed || bytesAvailable == 0);
175175

176176
if (req->stream) {
177-
logmsg("> NPP_DestroyStream %s %d\n", req->originalUrl, req->doneReason);
177+
dbglogmsg("> NPP_DestroyStream %s %d\n", req->originalUrl, req->doneReason);
178178
err = pluginFuncs.destroystream(&npp, req->stream, req->doneReason);
179179
if (err != NPERR_NO_ERROR) {
180180
logmsg("destroystream error %d\n", err);
@@ -184,7 +184,7 @@ handle_io_progress(Request *req)
184184
}
185185

186186
if (req->doNotify) {
187-
logmsg("> NPP_UrlNotify %s %d %p\n", req->originalUrl, req->doneReason, req->notifyData);
187+
dbglogmsg("> NPP_UrlNotify %s %d %p\n", req->originalUrl, req->doneReason, req->notifyData);
188188
pluginFuncs.urlnotify(&npp, req->originalUrl, req->doneReason, req->notifyData);
189189
}
190190

0 commit comments

Comments
 (0)