Commit1cd6a97

committed

Free base36enc's results

1 parente861c7f commit1cd6a97Copy full SHA for 1cd6a97

File tree

+18

-10

lines changed

+18

-10

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -263,9 +263,11 @@ pgBackupDeleteFiles(pgBackup *backup)`
`263`	`263`	`if (backup->status==BACKUP_STATUS_DELETED)`
`264`	`264`	`return0;`
`265`	`265`
	`266`	`+backup_id=base36enc(backup->start_time);`
`266`	`267`	`time2iso(timestamp,lengthof(timestamp),backup->recovery_time);`
`267`	`268`
`268`		`-elog(INFO,"delete: %s %s",base36enc(backup->start_time),timestamp);`
	`269`	`+elog(INFO,"delete: %s %s",backup_id,timestamp);`
	`270`	`+free(backup_id);`
`269`	`271`
`270`	`272`	`/*`
`271`	`273`	`* Update STATUS to BACKUP_STATUS_DELETING in preparation for the case which`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ do_restore_or_validate(time_t target_backup_id,`
`159`	`159`	`{`
`160`	`160`	`if (target_backup_id!=INVALID_BACKUP_ID)`
`161`	`161`	`elog(ERROR,"target backup %s does not satisfy restore options",`
`162`		`-base36enc(target_backup_id));`
	`162`	`+base36enc(target_backup_id));`
`163`	`163`	`else`
`164`	`164`	`/* Try to find another backup that satisfies target options */`
`165`	`165`	`continue;`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ do_show(time_t requested_backup_id)`
`33`	`33`	`if (backup==NULL)`
`34`	`34`	`{`
`35`	`35`	`elog(INFO,"Requested backup \"%s\" is not found.",`
	`36`	`+/* We do not need free base36enc's result, we exit anyway */`
`36`	`37`	`base36enc(requested_backup_id));`
`37`	`38`	`/* This is not error */`
`38`	`39`	`return0;`
`@@ -174,6 +175,7 @@ show_backup_list(FILE out, parray backup_list)`
`174`	`175`	`{`
`175`	`176`	`pgBackup*backup=parray_get(backup_list,i);`
`176`	`177`	`TimeLineIDparent_tli;`
	`178`	`+char*backup_id;`
`177`	`179`	`chartimestamp[20]="----";`
`178`	`180`	`charduration[20]="----";`
`179`	`181`	`chardata_bytes_str[10]="----";`
`@@ -194,9 +196,10 @@ show_backup_list(FILE out, parray backup_list)`
`194`	`196`
`195`	`197`	`/* Get parent timeline before printing */`
`196`	`198`	`parent_tli=get_parent_tli(backup->tli);`
	`199`	`+backup_id=base36enc(backup->start_time);`
`197`	`200`
`198`	`201`	`fprintf(out,"%-8s %-19s %s%-9s %2d / %d %5s %6s %2X/%08X %2X/%08X %-8s\n",`
`199`		`-base36enc(backup->start_time),`
	`202`	`+backup_id,`
`200`	`203`	`timestamp,`
`201`	`204`	`backupModes[backup->backup_mode],`
`202`	`205`	`backup->stream ?"+STREAM":"+ARCHIVE",`
`@@ -209,6 +212,8 @@ show_backup_list(FILE out, parray backup_list)`
`209`	`212`	`(uint32) (backup->stop_lsn >>32),`
`210`	`213`	`(uint32)backup->stop_lsn,`
`211`	`214`	`status2str(backup->status));`
	`215`	`+`
	`216`	`+free(backup_id);`
`212`	`217`	`}`
`213`	`218`	`}`
`214`	`219`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,14 @@ typedef struct`
`29`	`29`	`void`
`30`	`30`	`pgBackupValidate(pgBackup*backup)`
`31`	`31`	`{`
`32`		`-char*backup_id_string;`
`33`		`-charbase_path[MAXPGPATH];`
`34`		`-charpath[MAXPGPATH];`
`35`		`-parray*files;`
`36`		`-boolcorrupted= false;`
	`32`	`+char*backup_id_string;`
	`33`	`+charbase_path[MAXPGPATH];`
	`34`	`+charpath[MAXPGPATH];`
	`35`	`+parray*files;`
	`36`	`+boolcorrupted= false;`
`37`	`37`	`pthread_tvalidate_threads[num_threads];`
`38`	`38`	`validate_files_args*validate_threads_args[num_threads];`
`39`		`-inti;`
	`39`	`+inti;`
`40`	`40`
`41`	`41`	`backup_id_string=base36enc(backup->start_time);`
`42`	`42`
`@@ -54,7 +54,7 @@ pgBackupValidate(pgBackup *backup)`
`54`	`54`	`/* setup threads */`
`55`	`55`	`for (i=0;i<parray_num(files);i++)`
`56`	`56`	`{`
`57`		`-pgFilefile= (pgFile)parray_get(files,i);`
	`57`	`+pgFilefile= (pgFile)parray_get(files,i);`
`58`	`58`	`__sync_lock_release(&file->lock);`
`59`	`59`	`}`
`60`	`60`
`@@ -95,6 +95,7 @@ pgBackupValidate(pgBackup *backup)`
`95`	`95`	`elog(WARNING,"Backup %s is corrupted",backup_id_string);`
`96`	`96`	`else`
`97`	`97`	`elog(LOG,"Backup %s is valid",backup_id_string);`
	`98`	`+free(backup_id_string);`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`/*`

Comments

(0)